diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2014-03-31 16:24:26 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2014-03-31 16:24:26 +0000 |
| commit | 20fb79be3ff8c970f1a165493c802ee62d84ed5f (patch) | |
| tree | 14925b8587fbac5be3ba4e1cca6a8c1cd6e66ee3 | |
| parent | 5c9427b59c8fcbccab28843a886dcd65593b8117 (diff) | |
| download | python-urllib3-20fb79be3ff8c970f1a165493c802ee62d84ed5f.tar python-urllib3-20fb79be3ff8c970f1a165493c802ee62d84ed5f.tar.gz | |
Fixed two forgotten imports from the removed embedded python-six
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 22 |
1 files changed, 22 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 index d7acf04..95d6de1 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -104,3 +104,25 @@ Last-Update: 2014-03-31 class TestRequestField(unittest.TestCase): +--- a/urllib3/_collections.py ++++ b/urllib3/_collections.py +@@ -20,7 +20,7 @@ + from collections import OrderedDict + except ImportError: + from .packages.ordered_dict import OrderedDict +-from .packages.six import itervalues ++from six import itervalues + + + __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict'] +--- a/urllib3/connection.py ++++ b/urllib3/connection.py +@@ -39,7 +39,7 @@ + ConnectTimeoutError, + ) + from .packages.ssl_match_hostname import match_hostname +-from .packages import six ++import six + from .util import ( + assert_fingerprint, + resolve_cert_reqs, |