diff options
Diffstat (limited to 'debian/patches/01_do-not-use-embedded-python-six.patch')
| -rw-r--r-- | debian/patches/01_do-not-use-embedded-python-six.patch | 50 |
1 files changed, 32 insertions, 18 deletions
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 553086b..d77ae2b 100644 --- a/debian/patches/01_do-not-use-embedded-python-six.patch +++ b/debian/patches/01_do-not-use-embedded-python-six.patch @@ -1,4 +1,4 @@ -From 39fe68dc64cc8b675bb94892935ef2c8b50f583c Mon Sep 17 00:00:00 2001 +From ef4ec8903f3642a36635cea16ca54a6ed98b5d54 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli <eriol@mornie.org> Date: Thu, 8 Oct 2015 13:19:46 -0700 Subject: Do not use embedded copy of python-six. @@ -7,23 +7,24 @@ Forwarded: not-needed Patch-Name: 01_do-not-use-embedded-python-six.patch --- - dummyserver/handlers.py | 2 +- - test/__init__.py | 2 +- - test/contrib/test_pyopenssl.py | 2 +- - test/test_collections.py | 2 +- - test/test_fields.py | 2 +- - test/test_filepost.py | 2 +- - test/test_retry.py | 2 +- - urllib3/_collections.py | 2 +- - urllib3/connection.py | 2 +- - urllib3/connectionpool.py | 2 +- - urllib3/fields.py | 2 +- - urllib3/filepost.py | 4 ++-- - urllib3/response.py | 4 ++-- - urllib3/util/request.py | 2 +- - urllib3/util/response.py | 3 ++- - urllib3/util/retry.py | 2 +- - 16 files changed, 19 insertions(+), 18 deletions(-) + dummyserver/handlers.py | 2 +- + test/__init__.py | 2 +- + test/contrib/test_pyopenssl.py | 2 +- + test/test_collections.py | 2 +- + test/test_fields.py | 2 +- + test/test_filepost.py | 2 +- + test/test_retry.py | 2 +- + test/with_dummyserver/test_https.py | 2 +- + urllib3/_collections.py | 2 +- + urllib3/connection.py | 2 +- + urllib3/connectionpool.py | 2 +- + urllib3/fields.py | 2 +- + urllib3/filepost.py | 4 ++-- + urllib3/response.py | 4 ++-- + urllib3/util/request.py | 2 +- + urllib3/util/response.py | 3 ++- + urllib3/util/retry.py | 2 +- + 17 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py index fb6f44f..c5ac9b4 100644 @@ -114,6 +115,19 @@ index 421e508..8fcc287 100644 from urllib3.util.retry import Retry from urllib3.exceptions import ( ConnectTimeoutError, +diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py +index 7319d7e..8c16d30 100644 +--- a/test/with_dummyserver/test_https.py ++++ b/test/with_dummyserver/test_https.py +@@ -36,7 +36,7 @@ from urllib3.exceptions import ( + SystemTimeWarning, + InsecurePlatformWarning, + ) +-from urllib3.packages import six ++import six + from urllib3.util.timeout import Timeout + from urllib3.util.ssl_ import HAS_SNI + diff --git a/urllib3/_collections.py b/urllib3/_collections.py index 67f3ce9..b69ce20 100644 --- a/urllib3/_collections.py |