diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2013-05-07 03:08:04 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2013-05-07 03:08:04 +0000 |
| commit | 5c3e5a20f60bedcd577fd5f6d1048f4039c6464a (patch) | |
| tree | 0233f10cad6655d5d4a8430a1a2c996c427c3761 /debian/patches/01_do-not-use-embedded-python-six.patch | |
| parent | 9490f54ad7587596c7b26e76c628d4ff4e5c4a14 (diff) | |
| download | python-urllib3-5c3e5a20f60bedcd577fd5f6d1048f4039c6464a.tar python-urllib3-5c3e5a20f60bedcd577fd5f6d1048f4039c6464a.tar.gz | |
Refreshed patches
Diffstat (limited to 'debian/patches/01_do-not-use-embedded-python-six.patch')
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 56 |
1 files changed, 28 insertions, 28 deletions
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 111513d..f88c1ef 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -1,73 +1,73 @@ Description: Do not use embedded copy of python-six. Author: Daniele Tricoli <eriol@mornie.org> Forwarded: not-needed -Last-Update: 2012-11-09 +Last-Update: 2013-05-07 --- a/test/test_collections.py +++ b/test/test_collections.py @@ -1,7 +1,7 @@ import unittest - + from urllib3._collections import RecentlyUsedContainer as Container -from urllib3.packages import six +import six xrange = six.moves.xrange - - + + --- a/urllib3/connectionpool.py +++ b/urllib3/connectionpool.py -@@ -52,7 +52,7 @@ +@@ -54,7 +54,7 @@ ) - + from .packages.ssl_match_hostname import match_hostname, CertificateError -from .packages import six +import six - - + + xrange = six.moves.xrange --- a/urllib3/filepost.py +++ b/urllib3/filepost.py @@ -10,8 +10,8 @@ from uuid import uuid4 from io import BytesIO - + -from .packages import six -from .packages.six import b +import six +from six import b - + writer = codecs.lookup('utf-8')[3] - + --- a/urllib3/response.py +++ b/urllib3/response.py -@@ -11,7 +11,7 @@ - from io import BytesIO - +@@ -9,7 +9,7 @@ + import zlib + from .exceptions import DecodeError --from .packages.six import string_types as basestring -+from six import string_types as basestring - - +-from .packages.six import string_types as basestring, binary_type ++from six import string_types as basestring, binary_type + + log = logging.getLogger(__name__) --- a/urllib3/util.py +++ b/urllib3/util.py -@@ -18,7 +18,7 @@ - except ImportError: # `select` doesn't exist on AppEngine. - select = False - +@@ -32,7 +32,7 @@ + pass + + -from .packages import six +import six - from .exceptions import LocationParseError - - + from .exceptions import LocationParseError, SSLError + + --- a/test/test_filepost.py +++ b/test/test_filepost.py @@ -1,7 +1,7 @@ import unittest - + from urllib3.filepost import encode_multipart_formdata, iter_fields -from urllib3.packages.six import b, u +from six import b, u - - + + BOUNDARY = '!! test boundary !!' |