* debian/patches/01_do-not-use-embedded-python-six.patch

  - Refreshed
* debian/rules
  - Actually remove the embedded python-six from binary packages

3 files changed, 36 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index 63f2a9a..21c7141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,12 @@ python-urllib3 (1.3-2) UNRELEASED; urgency=low
   * debian/control
     - Tightened B-D of python-coverage to >= 3.4 (Closes: #668427)
     - Fixed typo in python3-urllib3's ${python3:Depends}
+  * debian/patches/01_do-not-use-embedded-python-six.patch
+    - Refreshed
+  * debian/rules
+    - Actually remove the embedded python-six from binary packages
 
- -- Daniele Tricoli <eriol@mornie.org>  Tue, 17 Apr 2012 16:10:11 +0200
+ -- Daniele Tricoli <eriol@mornie.org>  Tue, 17 Apr 2012 21:05:55 +0200
 
 python-urllib3 (1.3-1) unstable; urgency=low
 
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 f2fa877..6729f1d 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -1,62 +1,73 @@
 Description: Do not use embedded copy of python-six.
 Author: Daniele Tricoli <eriol@mornie.org>
 Forwarded: not-needed
-Last-Update: 2012-03-29
+Last-Update: 2012-04-17
 
 --- 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
-
-
+ 
+ 
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
 @@ -51,7 +51,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__)
 --- a/urllib3/util.py
 +++ b/urllib3/util.py
 @@ -16,7 +16,7 @@
      except ImportError: # `select` doesn't exist on AppEngine.
          select = False
-
+ 
 -from .packages import six
 +import six
  from .exceptions import LocationParseError
-
-
+ 
+ 
+--- a/test/test_filepost.py
++++ b/test/test_filepost.py
+@@ -1,7 +1,7 @@
+ import unittest
+ 
+ from urllib3.filepost import encode_multipart_formdata, iter_fields
+-from urllib3.packages.six import b, u
++from six import b, u
+ 
+ 
+ BOUNDARY = '!! test boundary !!'
diff --git a/debian/rules b/debian/rules
index 8532720..ffd760c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,9 @@ PY3VERS := $(shell py3versions -r)
 %:
 	dh $@ --with python2,python3 --buildsystem=python_distutils
 
+override_dh_auto_configure:
+	rm -f urllib3/packages/six.py
+
 override_dh_auto_build:
 	set -ex; \
 	for python in $(PYVERS) $(PY3VERS); do \