diff --git a/PKG-INFO b/PKG-INFO index 8570be6..657a3c2 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cbor -Version: 0.1.24 +Version: 1.0.0 Summary: RFC 7049 - Concise Binary Object Representation Home-page: https://bitbucket.org/bodhisnarkva/cbor Author: Brian Olson @@ -16,12 +16,12 @@ This library includes a C implementation which runs 3-5 times faster than the Python standard library's C-accelerated implementanion of JSON. This is also includes a 100% Python implementation. Platform: UNKNOWN -Classifier: Development Status :: 4 - Beta +Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: C Classifier: Topic :: Software Development :: Libraries :: Python Modules diff --git a/c/cbormodule.c b/c/cbormodule.c index f400604..88528fe 100644 --- a/c/cbormodule.c +++ b/c/cbormodule.c @@ -453,8 +453,11 @@ PyErr_Format(PyExc_RuntimeError, "unknown cbor marker %02x", c); return NULL; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunreachable-code" PyErr_SetString(PyExc_RuntimeError, "cbor library internal error moof!"); return NULL; +#pragma GCC diagnostic pop } static int loads_kv(PyObject* out, Reader* rin) { @@ -531,8 +534,11 @@ PyErr_Format(PyExc_ValueError, "TAG BIGNUM not followed by bytes but %02x", sc); return NULL; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunreachable-code" PyErr_Format(PyExc_ValueError, "TODO: WRITEME CBOR TAG BIGNUM %02x ...\n", sc); return NULL; +#pragma GCC diagnostic pop } else if (aux == CBOR_TAG_NEGBIGNUM) { // If the next object is bytes, interpret it here without making a PyObject for it. uint8_t sc; @@ -550,8 +556,11 @@ PyErr_Format(PyExc_ValueError, "TAG NEGBIGNUM not followed by bytes but %02x", sc); return NULL; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunreachable-code" PyErr_Format(PyExc_ValueError, "TODO: WRITEME CBOR TAG NEGBIGNUM %02x ...\n", sc); return NULL; +#pragma GCC diagnostic pop } out = inner_loads(rin); if (out == NULL) { return NULL; } @@ -1107,7 +1116,7 @@ #ifdef Py_INTOBJECT_H if (PyInt_Check(tag_num)) { long val = PyInt_AsLong(tag_num); - if (val > 0) { + if (val >= 0) { tag_aux_out(CBOR_TAG, val, out, &pos); err = inner_dumps(optp, tag_value, out, &pos); } else { @@ -1468,7 +1477,11 @@ modef.m_doc = NULL; modef.m_size = 0; modef.m_methods = CborMethods; - modef.m_reload = NULL; +#ifdef Py_mod_exec + modef.m_slots = NULL; // Py >= 3.5 +#else + modef.m_reload = NULL; // Py < 3.5 +#endif modef.m_traverse = NULL; modef.m_clear = NULL; modef.m_free = NULL; diff --git a/cbor/VERSION.py b/cbor/VERSION.py index cd3ff78..2d2e435 100644 --- a/cbor/VERSION.py +++ b/cbor/VERSION.py @@ -1 +1 @@ -'0.1.24' +'1.0.0' diff --git a/cbor.egg-info/PKG-INFO b/cbor.egg-info/PKG-INFO index 8570be6..657a3c2 100644 --- a/cbor.egg-info/PKG-INFO +++ b/cbor.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cbor -Version: 0.1.24 +Version: 1.0.0 Summary: RFC 7049 - Concise Binary Object Representation Home-page: https://bitbucket.org/bodhisnarkva/cbor Author: Brian Olson @@ -16,12 +16,12 @@ This library includes a C implementation which runs 3-5 times faster than the Python standard library's C-accelerated implementanion of JSON. This is also includes a 100% Python implementation. Platform: UNKNOWN -Classifier: Development Status :: 4 - Beta +Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: C Classifier: Topic :: Software Development :: Libraries :: Python Modules diff --git a/setup.py b/setup.py index 37a25ab..ec20768 100644 --- a/setup.py +++ b/setup.py @@ -87,13 +87,13 @@ ], license='Apache', classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: Apache Software License', 'Operating System :: OS Independent', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Programming Language :: C', 'Topic :: Software Development :: Libraries :: Python Modules', ],