aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-08-17 14:03:48 +0000
committerDaniele Tricoli <eriol@mornie.org>2015-08-17 14:03:48 +0000
commit1b2adcbcf7f1b908a10d6e0f3db0b510f24093e5 (patch)
tree5f2c222ad5dc4284ed41875ccd9f30741fd4186d /debian
parentf85c9c2eeda0db947e3128e08078273953ee5e49 (diff)
downloadpython-urllib3-1b2adcbcf7f1b908a10d6e0f3db0b510f24093e5.tar
python-urllib3-1b2adcbcf7f1b908a10d6e0f3db0b510f24093e5.tar.gz
Refresh 01_do-not-use-embedded-python-six.patch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/01_do-not-use-embedded-python-six.patch10
2 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index cf6cf7f..ddb8a1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
python-urllib3 (1.11-1) UNRELEASED; urgency=medium
* New upstream release.
+ * debian/patches/01_do-not-use-embedded-python-six.patch
+ - Refresh.
- -- Daniele Tricoli <eriol@mornie.org> Mon, 17 Aug 2015 15:23:17 +0200
+ -- Daniele Tricoli <eriol@mornie.org> Mon, 17 Aug 2015 16:02:43 +0200
python-urllib3 (1.10.4-1) 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 2ad8061..9f4c025 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -16,7 +16,7 @@ Last-Update: 2015-05-03
from nose.plugins.skip import SkipTest
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
-@@ -27,7 +27,7 @@
+@@ -28,7 +28,7 @@
InsecureRequestWarning,
)
from .packages.ssl_match_hostname import CertificateError
@@ -40,14 +40,14 @@ Last-Update: 2015-05-03
writer = codecs.lookup('utf-8')[3]
--- a/urllib3/response.py
+++ b/urllib3/response.py
-@@ -10,7 +10,7 @@
+@@ -11,7 +11,7 @@
from .exceptions import (
ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
)
-from .packages.six import string_types as basestring, binary_type, PY3
+from six import string_types as basestring, binary_type, PY3
from .connection import HTTPException, BaseSSLError
- from .util.response import is_fp_closed
+ from .util.response import is_fp_closed, is_response_to_head
--- a/test/test_filepost.py
+++ b/test/test_filepost.py
@@ -62,7 +62,7 @@ Last-Update: 2015-05-03
BOUNDARY = '!! test boundary !!'
--- a/dummyserver/handlers.py
+++ b/dummyserver/handlers.py
-@@ -211,7 +211,7 @@
+@@ -261,7 +261,7 @@
"""
import tornado.httputil
import email.utils
@@ -149,7 +149,7 @@ Last-Update: 2015-05-03
ConnectTimeoutError,
--- a/test/__init__.py
+++ b/test/__init__.py
-@@ -7,7 +7,7 @@
+@@ -8,7 +8,7 @@
from nose.plugins.skip import SkipTest
from urllib3.exceptions import MaxRetryError, HTTPWarning