Don't use embedded copy of python-six

1 files changed, 51 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__)