diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2012-03-28 23:40:45 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2012-03-28 23:40:45 +0000 |
| commit | e61e123f4f94a306e5d1d63f610e255405bfa14b (patch) | |
| tree | 343f45a7f301e923c7ce6550c764e68fdff83137 /debian/patches | |
| parent | c0b628790c2f3005b679dabd6126629ca853b119 (diff) | |
| download | python-urllib3-e61e123f4f94a306e5d1d63f610e255405bfa14b.tar python-urllib3-e61e123f4f94a306e5d1d63f610e255405bfa14b.tar.gz | |
* New upstream release
* debian/patches/01_do-not-use-embedded-python-six.patch
- Refreshed
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 41 |
1 files changed, 26 insertions, 15 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 042445d..f2fa877 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -1,51 +1,62 @@ Description: Do not use embedded copy of python-six. Author: Daniele Tricoli <eriol@mornie.org> Forwarded: not-needed -Last-Update: 2012-02-10 +Last-Update: 2012-03-29 --- 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 - - class TestLRUContainer(unittest.TestCase): + + --- a/urllib3/connectionpool.py +++ b/urllib3/connectionpool.py -@@ -59,7 +59,7 @@ +@@ -51,7 +51,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 @@ -14,8 +14,8 @@ - + 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 - + from .exceptions import HTTPError -from .packages.six import string_types as basestring +from six import string_types as basestring - - + + log = logging.getLogger(__name__) +--- a/urllib3/util.py ++++ b/urllib3/util.py +@@ -16,7 +16,7 @@ + except ImportError: # `select` doesn't exist on AppEngine. + select = False + +-from .packages import six ++import six + from .exceptions import LocationParseError + + |