diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2014-05-24 14:25:34 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2014-05-24 14:25:34 +0000 |
| commit | 2dbb15409aa65fdd002d9ea105b0065882bc9309 (patch) | |
| tree | 050308a03eb8d39cb558f5fdd0ae8debbf793a58 /debian | |
| parent | c0b4f11174df5009b8c0cc9268ed2b2bc7796e1f (diff) | |
| download | python-urllib3-2dbb15409aa65fdd002d9ea105b0065882bc9309.tar python-urllib3-2dbb15409aa65fdd002d9ea105b0065882bc9309.tar.gz | |
Refreshed 01_do-not-use-embedded-python-six.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 27 |
2 files changed, 16 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 650f914..0cee92f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ python-urllib3 (1.8.2-1) UNRELEASED; urgency=medium * New upstream release + * debian/patches/01_do-not-use-embedded-python-six.patch + - Refreshed - -- Daniele Tricoli <eriol@mornie.org> Sat, 24 May 2014 11:07:10 +0200 + -- Daniele Tricoli <eriol@mornie.org> Sat, 24 May 2014 16:24:14 +0200 python-urllib3 (1.8-2) unstable; urgency=medium 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 95d6de1..f95a1e1 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -1,7 +1,7 @@ Description: Do not use embedded copy of python-six. Author: Daniele Tricoli <eriol@mornie.org> Forwarded: not-needed -Last-Update: 2014-03-31 +Last-Update: 2014-05-24 --- a/test/test_collections.py +++ b/test/test_collections.py @@ -16,7 +16,7 @@ Last-Update: 2014-03-31 --- a/urllib3/connectionpool.py +++ b/urllib3/connectionpool.py -@@ -30,7 +30,7 @@ +@@ -32,7 +32,7 @@ ProxyError, ) from .packages.ssl_match_hostname import CertificateError @@ -49,17 +49,6 @@ Last-Update: 2014-03-31 from .util import is_fp_closed ---- a/urllib3/util.py -+++ b/urllib3/util.py -@@ -32,7 +32,7 @@ - except ImportError: - pass - --from .packages import six -+import six - from .exceptions import LocationParseError, SSLError, TimeoutStateError - - --- a/test/test_filepost.py +++ b/test/test_filepost.py @@ -2,7 +2,7 @@ @@ -73,7 +62,7 @@ Last-Update: 2014-03-31 BOUNDARY = '!! test boundary !!' --- a/dummyserver/handlers.py +++ b/dummyserver/handlers.py -@@ -186,7 +186,7 @@ +@@ -190,7 +190,7 @@ """ import tornado.httputil import email.utils @@ -126,3 +115,13 @@ Last-Update: 2014-03-31 from .util import ( assert_fingerprint, resolve_cert_reqs, +--- a/urllib3/util/request.py ++++ b/urllib3/util/request.py +@@ -1,6 +1,6 @@ + from base64 import b64encode + +-from ..packages import six ++import six + + + ACCEPT_ENCODING = 'gzip,deflate' |