merge patched into master

7 files changed, 39 insertions, 25 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 9f02acc..4454568 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-24ae6ba32069ca15f4a163e386964a3accdccf63
-24ae6ba32069ca15f4a163e386964a3accdccf63
+01eb41ddb423818d06a60ab7e40aae9cb7dcb23e
+01eb41ddb423818d06a60ab7e40aae9cb7dcb23e
 dff63335f212d32d7c1a4bb5276f2d31f5995ea1
 dff63335f212d32d7c1a4bb5276f2d31f5995ea1
 python-urllib3_1.13.1.orig.tar.gz
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
diff --git a/debian/patches/02_require-cert-verification.patch b/debian/patches/02_require-cert-verification.patch
index 99f6483..e366567 100644
--- a/debian/patches/02_require-cert-verification.patch
+++ b/debian/patches/02_require-cert-verification.patch
@@ -1,4 +1,4 @@
-From 27ce208c67f4041e8c7e9867236609e522cf06cb Mon Sep 17 00:00:00 2001
+From 3bc2dc494dd62e4a86e625dd3b5cb14880d3d268 Mon Sep 17 00:00:00 2001
 From: Jamie Strandboge <jamie@canonical.com>
 Date: Thu, 8 Oct 2015 13:19:47 -0700
 Subject: require SSL certificate validation by default by using
diff --git a/debian/patches/03_force_setuptools.patch b/debian/patches/03_force_setuptools.patch
index 4182284..91b3b76 100644
--- a/debian/patches/03_force_setuptools.patch
+++ b/debian/patches/03_force_setuptools.patch
@@ -1,4 +1,4 @@
-From 32579d35274ade2e68935bb21263b4dc63910ad6 Mon Sep 17 00:00:00 2001
+From 8cbae66e2b04e31a7d8f96f646eb2a758234e46e Mon Sep 17 00:00:00 2001
 From: Barry Warsaw <barry@debian.org>
 Date: Thu, 8 Oct 2015 13:19:49 -0700
 Subject: Use setuptools.setup() so that the bdist_wheel
diff --git a/debian/patches/04_relax_nosetests_options.patch b/debian/patches/04_relax_nosetests_options.patch
index a52b940..af3a86d 100644
--- a/debian/patches/04_relax_nosetests_options.patch
+++ b/debian/patches/04_relax_nosetests_options.patch
@@ -1,4 +1,4 @@
-From 11c93ac43225db29b9c7ead00e704ce97a11f89c Mon Sep 17 00:00:00 2001
+From bcaf5c8834b99ecd6f187d4f67c7e356c97d31ae Mon Sep 17 00:00:00 2001
 From: Daniele Tricoli <eriol@mornie.org>
 Date: Thu, 8 Oct 2015 13:19:50 -0700
 Subject: Do not use logging-clear-handlers to see all logging output and
diff --git a/debian/patches/05_avoid-embedded-ssl-match-hostname.patch b/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
index 1da4d26..4e391d4 100644
--- a/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
+++ b/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
@@ -1,4 +1,4 @@
-From 24ae6ba32069ca15f4a163e386964a3accdccf63 Mon Sep 17 00:00:00 2001
+From 01eb41ddb423818d06a60ab7e40aae9cb7dcb23e Mon Sep 17 00:00:00 2001
 From: Stefano Rivera <stefanor@debian.org>
 Date: Thu, 8 Oct 2015 13:19:51 -0700
 Subject: Do not use embedded copy of ssl.match_hostname, when possible
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