diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 28 |
2 files changed, 17 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 84eda2d..d0510a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ python-urllib3 (1.8-1) UNRELEASED; urgency=medium * New upstream release + * debian/patches/01_do-not-use-embedded-python-six.patch + - Refreshed - -- Daniele Tricoli <eriol@mornie.org> Mon, 31 Mar 2014 17:30:02 +0200 + -- Daniele Tricoli <eriol@mornie.org> Mon, 31 Mar 2014 17:50:10 +0200 python-urllib3 (1.7.1-1) unstable; urgency=low 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 7932776..d7acf04 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -1,14 +1,14 @@ Description: Do not use embedded copy of python-six. Author: Daniele Tricoli <eriol@mornie.org> Forwarded: not-needed -Last-Update: 2013-10-16 +Last-Update: 2014-03-31 --- a/test/test_collections.py +++ b/test/test_collections.py -@@ -1,7 +1,7 @@ - import unittest - - from urllib3._collections import RecentlyUsedContainer as Container +@@ -4,7 +4,7 @@ + HTTPHeaderDict, + RecentlyUsedContainer as Container + ) -from urllib3.packages import six +import six xrange = six.moves.xrange @@ -16,15 +16,15 @@ Last-Update: 2013-10-16 --- a/urllib3/connectionpool.py +++ b/urllib3/connectionpool.py -@@ -55,7 +55,7 @@ +@@ -30,7 +30,7 @@ ProxyError, ) - from .packages.ssl_match_hostname import CertificateError, match_hostname + from .packages.ssl_match_hostname import CertificateError -from .packages import six +import six - from .request import RequestMethods - from .response import HTTPResponse - from .util import ( + from .connection import ( + port_by_scheme, + DummyConnection, --- a/urllib3/filepost.py +++ b/urllib3/filepost.py @@ -10,8 +10,8 @@ @@ -40,9 +40,9 @@ Last-Update: 2013-10-16 writer = codecs.lookup('utf-8')[3] --- a/urllib3/response.py +++ b/urllib3/response.py -@@ -10,7 +10,7 @@ - import io +@@ -11,7 +11,7 @@ + from ._collections import HTTPHeaderDict from .exceptions import DecodeError -from .packages.six import string_types as basestring, binary_type +from six import string_types as basestring, binary_type @@ -99,8 +99,8 @@ Last-Update: 2013-10-16 import unittest from urllib3.fields import guess_content_type, RequestField --from urllib3.packages.six import b, u -+from six import b, u +-from urllib3.packages.six import u ++from six import u class TestRequestField(unittest.TestCase): |