diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2012-02-10 02:01:30 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2012-02-10 02:01:30 +0000 |
| commit | 901a145b9f9d0151adab085ef8de427ed0a07ecb (patch) | |
| tree | a20f7f06632c35d564a83a00c93adad24ae68615 /debian/patches | |
| parent | 2f76a5750b1a14a7090a21ead1df36ced1342733 (diff) | |
| download | python-urllib3-901a145b9f9d0151adab085ef8de427ed0a07ecb.tar python-urllib3-901a145b9f9d0151adab085ef8de427ed0a07ecb.tar.gz | |
Don't use embedded copy of python-six
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 51 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 52 insertions, 0 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 new file mode 100644 index 0000000..042445d --- /dev/null +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -0,0 +1,51 @@ +Description: Do not use embedded copy of python-six. +Author: Daniele Tricoli <eriol@mornie.org> +Forwarded: not-needed +Last-Update: 2012-02-10 + +--- 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 @@ + ) + + 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__) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..64de581 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_do-not-use-embedded-python-six.patch |