[Python-modules-commits] r20389 - in packages/python-urllib3/trunk/debian (4 files)

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

    Date: Friday, February 10, 2012 @ 02:01:30
  Author: eriol-guest
Revision: 20389

Don't use embedded copy of python-six

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

Modified: packages/python-urllib3/trunk/debian/control
===================================================================
--- packages/python-urllib3/trunk/debian/control	2012-02-09 21:39:07 UTC (rev 20388)
+++ packages/python-urllib3/trunk/debian/control	2012-02-10 02:01:30 UTC (rev 20389)
@@ -9,6 +9,7 @@
  python-coverage,
  python-nose (>=1.1.2),
  python-setuptools (>= 0.6b3),
+ python-six,
  python-tornado,
  python3-all
 Standards-Version: 3.9.2

Added: 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	                        (rev 0)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2012-02-10 02:01:30 UTC (rev 20389)
@@ -0,0 +1,51 @@
+Description: Do not use embedded copy of python-six.
+Author: Daniele Tricoli <eriol at 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__)

Added: packages/python-urllib3/trunk/debian/patches/series
===================================================================
--- packages/python-urllib3/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-urllib3/trunk/debian/patches/series	2012-02-10 02:01:30 UTC (rev 20389)
@@ -0,0 +1 @@
+01_do-not-use-embedded-python-six.patch