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

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

    Date: Wednesday, October 16, 2013 @ 16:18:43
  Author: eriol-guest
Revision: 26176

Fixed forgotten import of 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	2013-10-16 15:43:03 UTC (rev 26175)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2013-10-16 16:18:43 UTC (rev 26176)
@@ -71,3 +71,36 @@
  
  
  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):