diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 33 |
1 files changed, 33 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 9bc9e92..7932776 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -71,3 +71,36 @@ Last-Update: 2013-10-16 BOUNDARY = '!! test boundary !!' +--- a/dummyserver/handlers.py ++++ b/dummyserver/handlers.py +@@ -186,7 +186,7 @@ + """ + import tornado.httputil + import email.utils +- from urllib3.packages import six ++ import six + if not six.PY3: + line = line.encode('utf-8') + parts = tornado.httputil._parseparam(';' + line) +--- a/urllib3/fields.py ++++ b/urllib3/fields.py +@@ -7,7 +7,7 @@ + import email.utils + import mimetypes + +-from .packages import six ++import six + + + def guess_content_type(filename, default='application/octet-stream'): +--- a/test/test_fields.py ++++ b/test/test_fields.py +@@ -1,7 +1,7 @@ + import unittest + + from urllib3.fields import guess_content_type, RequestField +-from urllib3.packages.six import b, u ++from six import b, u + + + class TestRequestField(unittest.TestCase): |