diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index ce12612..ee541ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ python-urllib3 (1.10.3-1) UNRELEASED; urgency=medium * New upstream release. * debian/watch - Use pypi.debian.net redirector. + * debian/patches/01_do-not-use-embedded-python-six.patch + - Refresh. - -- Daniele Tricoli <eriol@mornie.org> Sun, 03 May 2015 15:49:16 +0200 + -- Daniele Tricoli <eriol@mornie.org> Sun, 03 May 2015 16:51:02 +0200 python-urllib3 (1.10-1) experimental; urgency=medium diff --git a/debian/patches/01_do-not-use-embedded-python-six.patch b/debian/patches/01_do-not-use-embedded-python-six.patch index 62a5a51..2ad8061 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -1,7 +1,7 @@ Description: Do not use embedded copy of python-six. Author: Daniele Tricoli <eriol@mornie.org> Forwarded: not-needed -Last-Update: 2014-12-31 +Last-Update: 2015-05-03 --- a/test/test_collections.py +++ b/test/test_collections.py @@ -13,7 +13,7 @@ Last-Update: 2014-12-31 +import six xrange = six.moves.xrange - + from nose.plugins.skip import SkipTest --- a/urllib3/connectionpool.py +++ b/urllib3/connectionpool.py @@ -27,7 +27,7 @@ @@ -40,12 +40,12 @@ Last-Update: 2014-12-31 writer = codecs.lookup('utf-8')[3] --- a/urllib3/response.py +++ b/urllib3/response.py -@@ -4,7 +4,7 @@ - - from ._collections import HTTPHeaderDict - from .exceptions import ProtocolError, DecodeError, ReadTimeoutError --from .packages.six import string_types as basestring, binary_type -+from six import string_types as basestring, binary_type +@@ -10,7 +10,7 @@ + from .exceptions import ( + ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked + ) +-from .packages.six import string_types as basestring, binary_type, PY3 ++from six import string_types as basestring, binary_type, PY3 from .connection import HTTPException, BaseSSLError from .util.response import is_fp_closed @@ -99,8 +99,8 @@ Last-Update: 2014-12-31 from collections import OrderedDict except ImportError: from .packages.ordered_dict import OrderedDict --from .packages.six import iterkeys, itervalues -+from six import iterkeys, itervalues +-from .packages.six import iterkeys, itervalues, PY3 ++from six import iterkeys, itervalues, PY3 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict'] |