merge patched into master

7 files changed, 17 insertions, 30 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 363e772..225195f 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -1,10 +1,9 @@
-From 3a7deaa269ec9e1dc5dfb860e29b053475647cf5 Mon Sep 17 00:00:00 2001
+From 4e097b776bf499a02b262c722487fcd55c2ee379 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.
 
 Forwarded: not-needed
-Last-Update: 2015-05-03
 
 Patch-Name: 01_do-not-use-embedded-python-six.patch
 ---
@@ -22,8 +21,9 @@ Patch-Name: 01_do-not-use-embedded-python-six.patch
  urllib3/filepost.py            | 4 ++--
  urllib3/response.py            | 4 ++--
  urllib3/util/request.py        | 2 +-
+ urllib3/util/response.py       | 2 +-
  urllib3/util/retry.py          | 2 +-
- 15 files changed, 17 insertions(+), 17 deletions(-)
+ 16 files changed, 18 insertions(+), 18 deletions(-)
 
 diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
 index 43398cd..a7828a3 100644
@@ -208,6 +208,16 @@ index bc64f6b..5f4ccfd 100644
  
  ACCEPT_ENCODING = 'gzip,deflate'
  
+diff --git a/urllib3/util/response.py b/urllib3/util/response.py
+index 2c1de15..6695809 100644
+--- a/urllib3/util/response.py
++++ b/urllib3/util/response.py
+@@ -1,4 +1,4 @@
+-from ..packages.six.moves import http_client as httplib
++from six.moves import http_client as httplib
+ 
+ from ..exceptions import HeaderParsingError
+ 
 diff --git a/urllib3/util/retry.py b/urllib3/util/retry.py
 index 1fb1f23..178b374 100644
 --- a/urllib3/util/retry.py
diff --git a/debian/patches/02_require-cert-verification.patch b/debian/patches/02_require-cert-verification.patch
index b10b3b1..75d38b6 100644
--- a/debian/patches/02_require-cert-verification.patch
+++ b/debian/patches/02_require-cert-verification.patch
@@ -1,4 +1,4 @@
-From f27a60baa815150ce224d1be75464c46d987f749 Mon Sep 17 00:00:00 2001
+From 9e59bf6b30776302e6ccd960331a91d073f6a0c3 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 b1b3234..37e1512 100644
--- a/debian/patches/03_force_setuptools.patch
+++ b/debian/patches/03_force_setuptools.patch
@@ -1,4 +1,4 @@
-From a89ef67cc90bdfc8d4832cdd07baed149bdffd88 Mon Sep 17 00:00:00 2001
+From f3ff91a4a00160a0e1afcaa7cd79219cd851bccd 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 bec12aa..b898d19 100644
--- a/debian/patches/04_relax_nosetests_options.patch
+++ b/debian/patches/04_relax_nosetests_options.patch
@@ -1,4 +1,4 @@
-From 966d73488bc803f437395d8337bd322a0016084f Mon Sep 17 00:00:00 2001
+From 28953c4c9c5ad7893bd392658016019fbf78088a 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 9bb55f6..04894d4 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 797a60975f0ff4dcf615fca6f8b51ce62e5e91a6 Mon Sep 17 00:00:00 2001
+From 842fd4e9f188f13313124e3750f1c768d319fc34 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/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch b/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
deleted file mode 100644
index 435b6bb..0000000
--- a/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7db0aa9b18e70f43ef0bfcdec7f223e5b681aaf0 Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 13:19:52 -0700
-Subject: Rely on six to import httplib or http.client.
-
-Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3950429a15
-
-Patch-Name: 06_rely-on-six-to-import-httplib-or-http.client.patch
----
- urllib3/util/response.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/urllib3/util/response.py b/urllib3/util/response.py
-index 2c1de15..6695809 100644
---- a/urllib3/util/response.py
-+++ b/urllib3/util/response.py
-@@ -1,4 +1,4 @@
--from ..packages.six.moves import http_client as httplib
-+from six.moves import http_client as httplib
- 
- from ..exceptions import HeaderParsingError
- 
diff --git a/debian/patches/series b/debian/patches/series
index b91b93d..b77d657 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
 03_force_setuptools.patch
 04_relax_nosetests_options.patch
 05_avoid-embedded-ssl-match-hostname.patch
-06_rely-on-six-to-import-httplib-or-http.client.patch