[Python-modules-commits] r21255 - in packages/python-urllib3/trunk/debian (3 files)
eriol-guest at users.alioth.debian.org
eriol-guest at users.alioth.debian.org
Tue Apr 17 19:11:28 UTC 2012
Date: Tuesday, April 17, 2012 @ 19:11:21
Author: eriol-guest
Revision: 21255
* debian/patches/01_do-not-use-embedded-python-six.patch
- Refreshed
* debian/rules
- Actually remove the embedded python-six from binary packages
Modified:
packages/python-urllib3/trunk/debian/changelog
packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch
packages/python-urllib3/trunk/debian/rules
Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog 2012-04-17 18:35:19 UTC (rev 21254)
+++ packages/python-urllib3/trunk/debian/changelog 2012-04-17 19:11:21 UTC (rev 21255)
@@ -3,8 +3,12 @@
* 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 at mornie.org> Tue, 17 Apr 2012 16:10:11 +0200
+ -- Daniele Tricoli <eriol at mornie.org> Tue, 17 Apr 2012 21:05:55 +0200
python-urllib3 (1.3-1) unstable; urgency=low
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 2012-04-17 18:35:19 UTC (rev 21254)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch 2012-04-17 19:11:21 UTC (rev 21255)
@@ -1,62 +1,73 @@
Description: Do not use embedded copy of python-six.
Author: Daniele Tricoli <eriol at 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 !!'
Modified: packages/python-urllib3/trunk/debian/rules
===================================================================
--- packages/python-urllib3/trunk/debian/rules 2012-04-17 18:35:19 UTC (rev 21254)
+++ packages/python-urllib3/trunk/debian/rules 2012-04-17 19:11:21 UTC (rev 21255)
@@ -8,6 +8,9 @@
%:
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 \
More information about the Python-modules-commits
mailing list