diff options
| author | Agustin Henze <tin@debian.org> | 2017-09-13 18:34:26 -0300 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2017-09-14 04:35:40 +0000 |
| commit | 4fe707addcd980b30fc4491c1c3a00d1eb6b40e3 (patch) | |
| tree | 55b92218970bf4be4f326fe6e8d9bae616a7f8d2 | |
| parent | cb4dee9ef5b0abc1085e196faba33bd37446b00f (diff) | |
| parent | a7976d57cbc7317245d80b047650b38098237719 (diff) | |
1.0.0-1 (patches applied)applied/1.0.0-1applied/ubuntu/bionic-proposedapplied/ubuntu/bionic-develapplied/ubuntu/bionicapplied/debian/buster
Imported using git-ubuntu import.
| -rw-r--r-- | PKG-INFO | 6 | ||||
| -rw-r--r-- | c/cbormodule.c | 17 | ||||
| -rw-r--r-- | cbor.egg-info/PKG-INFO | 6 | ||||
| -rw-r--r-- | cbor/VERSION.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rw-r--r-- | debian/patches/missing-member-m_reload-on-pymoduledef-py3-5.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | setup.py | 4 |
9 files changed, 37 insertions, 39 deletions
@@ -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 @@ Description: 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 f0577b5..88528fe 100644 --- a/c/cbormodule.c +++ b/c/cbormodule.c @@ -453,8 +453,11 @@ PyObject* inner_loads_c(Reader* rin, uint8_t c) { 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 @@ static PyObject* loads_tag(Reader* rin, uint64_t aux) { 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 @@ static PyObject* loads_tag(Reader* rin, uint64_t aux) { 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 @@ static int dumps_tag(EncodeOptions *optp, PyObject* ob, uint8_t* out, uintptr_t* #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,10 +1477,10 @@ PyInit__cbor(void) modef.m_doc = NULL; modef.m_size = 0; modef.m_methods = CborMethods; -#if PY_MINOR_VERSION >= 5 - modef.m_slots = NULL, +#ifdef Py_mod_exec + modef.m_slots = NULL; // Py >= 3.5 #else - modef.m_reload = NULL, + modef.m_reload = NULL; // Py < 3.5 #endif modef.m_traverse = NULL; modef.m_clear = NULL; 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 @@ Description: 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/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/debian/changelog b/debian/changelog index f49f08e..b27eff0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-cbor (1.0.0-1) unstable; urgency=medium + + * New upstream version 1.0.0 (Closes: #875707) + * Remove patches, it's already fixed on upstream + * Use secure URIs on VCS fields + * Fix lintian warnings on short descriptions + * Bumped Standard-Version to 4.0.0 (no changes required) + + -- Agustin Henze <tin@debian.org> Wed, 13 Sep 2017 18:34:26 -0300 + python-cbor (0.1.24-1) unstable; urgency=medium * Imported Upstream version 0.1.24 diff --git a/debian/control b/debian/control index b4f9525..40625ba 100644 --- a/debian/control +++ b/debian/control @@ -10,17 +10,17 @@ Build-Depends: debhelper (>= 9), python-all, python-setuptools, python-dev, -Standards-Version: 3.9.6 +Standards-Version: 4.0.0 X-Python-Version: >= 2.7 X-Python3-Version: >= 3.3 Homepage: https://bitbucket.org/bodhisnarkva/cbor -Vcs-Git: git://anonscm.debian.org/collab-maint/python-cbor.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/python-cbor.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/python-cbor.git +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/python-cbor.git Package: python3-cbor Architecture: any Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} -Description: Python Implementation of RFC 7049. Concise Binary Object Representation (CBOR). +Description: Python3 Implementation of RFC 7049. Concise Binary Object Representation (CBOR) CBOR is comparable to JSON, has a superset of JSON’s ability, but serializes to a binary format which is smaller and faster to generate and parse. . @@ -32,7 +32,7 @@ Description: Python Implementation of RFC 7049. Concise Binary Object Representa Package: python-cbor Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Description: Python Implementation of RFC 7049. Concise Binary Object Representation (CBOR). +Description: Python Implementation of RFC 7049. Concise Binary Object Representation (CBOR) CBOR is comparable to JSON, has a superset of JSON’s ability, but serializes to a binary format which is smaller and faster to generate and parse. . diff --git a/debian/patches/missing-member-m_reload-on-pymoduledef-py3-5.patch b/debian/patches/missing-member-m_reload-on-pymoduledef-py3-5.patch deleted file mode 100644 index 2b9c9ce..0000000 --- a/debian/patches/missing-member-m_reload-on-pymoduledef-py3-5.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Agustin Henze <tin@debian.org> -Bug-Debian: https://bugs.debian.org/800888 - ---- - ---- python-cbor-0.1.24.orig/c/cbormodule.c -+++ python-cbor-0.1.24/c/cbormodule.c -@@ -1468,7 +1468,11 @@ PyInit__cbor(void) - modef.m_doc = NULL; - modef.m_size = 0; - modef.m_methods = CborMethods; -- modef.m_reload = NULL; -+#if PY_MINOR_VERSION >= 5 -+ modef.m_slots = NULL, -+#else -+ modef.m_reload = NULL, -+#endif - modef.m_traverse = NULL; - modef.m_clear = NULL; - modef.m_free = NULL; diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 635cca8..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -missing-member-m_reload-on-pymoduledef-py3-5.patch @@ -87,13 +87,13 @@ This library includes a C implementation which runs 3-5 times faster than the Py ], 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', ], |