From 20fb79be3ff8c970f1a165493c802ee62d84ed5f Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Mon, 31 Mar 2014 16:24:26 +0000 Subject: Fixed two forgotten imports from the removed embedded python-six --- .../01_do-not-use-embedded-python-six.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) 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, -- cgit v1.2.3