[Python-modules-commits] r28401 - in packages/python-urllib3/trunk/debian/patches (1 file)

[eriol-guest at users.alioth.debian.org]

    Date: Monday, March 31, 2014 @ 16:24:26
  Author: eriol-guest
Revision: 28401

Fixed two forgotten imports from the removed embedded python-six

Modified:
  packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch

Modified: packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2014-03-31 15:51:35 UTC (rev 28400)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2014-03-31 16:24:26 UTC (rev 28401)
@@ -104,3 +104,25 @@
  
  
  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,