merge patched into master

6 files changed, 32 insertions, 54 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 24710dd..363e772 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 e720aa3dea81bf5c30d9a897f9cbae18bf6a4228 Mon Sep 17 00:00:00 2001
+From 3a7deaa269ec9e1dc5dfb860e29b053475647cf5 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.
@@ -20,16 +20,16 @@ Patch-Name: 01_do-not-use-embedded-python-six.patch
  urllib3/connectionpool.py      | 2 +-
  urllib3/fields.py              | 2 +-
  urllib3/filepost.py            | 4 ++--
- urllib3/response.py            | 2 +-
+ urllib3/response.py            | 4 ++--
  urllib3/util/request.py        | 2 +-
  urllib3/util/retry.py          | 2 +-
- 15 files changed, 16 insertions(+), 16 deletions(-)
+ 15 files changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
-index ffa1dd3..1ee4dd7 100644
+index 43398cd..a7828a3 100644
 --- a/dummyserver/handlers.py
 +++ b/dummyserver/handlers.py
-@@ -261,7 +261,7 @@ def _parse_header(line):
+@@ -263,7 +263,7 @@ def _parse_header(line):
      """
      import tornado.httputil
      import email.utils
@@ -39,7 +39,7 @@ index ffa1dd3..1ee4dd7 100644
          line = line.encode('utf-8')
      parts = tornado.httputil._parseparam(';' + line)
 diff --git a/test/__init__.py b/test/__init__.py
-index 172493c..7ea6358 100644
+index f7c4a7a..22d3616 100644
 --- a/test/__init__.py
 +++ b/test/__init__.py
 @@ -8,7 +8,7 @@ import socket
@@ -128,12 +128,12 @@ index b68b9a5..af8074a 100644
  
  __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
 diff --git a/urllib3/connection.py b/urllib3/connection.py
-index f64dd1a..a2b8fcb 100644
+index 3eab1e2..115eac9 100644
 --- a/urllib3/connection.py
 +++ b/urllib3/connection.py
 @@ -3,7 +3,7 @@ import sys
  import socket
- from socket import timeout as SocketTimeout
+ from socket import error as SocketError, timeout as SocketTimeout
  import warnings
 -from .packages import six
 +import six
@@ -141,11 +141,11 @@ index f64dd1a..a2b8fcb 100644
  try:  # Python 3
      from http.client import HTTPConnection as _HTTPConnection, HTTPException
 diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
-index c958725..0750e24 100644
+index b38ac68..563f108 100644
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -28,7 +28,7 @@ from .exceptions import (
-     InsecureRequestWarning,
+@@ -30,7 +30,7 @@ from .exceptions import (
+     NewConnectionError,
  )
  from .packages.ssl_match_hostname import CertificateError
 -from .packages import six
@@ -182,15 +182,17 @@ index 0fbf488..97ab970 100644
  
  writer = codecs.lookup('utf-8')[3]
 diff --git a/urllib3/response.py b/urllib3/response.py
-index 15d4aac..64273db 100644
+index 788eb6c..c41bd2c 100644
 --- a/urllib3/response.py
 +++ b/urllib3/response.py
-@@ -11,7 +11,7 @@ from ._collections import HTTPHeaderDict
+@@ -7,8 +7,8 @@ from ._collections import HTTPHeaderDict
  from .exceptions import (
      ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
  )
 -from .packages.six import string_types as basestring, binary_type, PY3
+-from .packages.six.moves import http_client as httplib
 +from six import string_types as basestring, binary_type, PY3
++from six.moves import http_client as httplib
  from .connection import HTTPException, BaseSSLError
  from .util.response import is_fp_closed, is_response_to_head
  
diff --git a/debian/patches/02_require-cert-verification.patch b/debian/patches/02_require-cert-verification.patch
index 6973d7a..b10b3b1 100644
--- a/debian/patches/02_require-cert-verification.patch
+++ b/debian/patches/02_require-cert-verification.patch
@@ -1,4 +1,4 @@
-From 9cd0feeb36e835dbc9f394befd32e02ec1ce6841 Mon Sep 17 00:00:00 2001
+From f27a60baa815150ce224d1be75464c46d987f749 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
@@ -14,19 +14,19 @@ Patch-Name: 02_require-cert-verification.patch
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
-index 0750e24..fe2f546 100644
+index 563f108..a99d4ec 100644
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -679,6 +679,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
-     ``ssl_version`` are only used if :mod:`ssl` is available and are fed into
-     :meth:`urllib3.util.ssl_wrap_socket` to upgrade the connection socket
-     into an SSL socket.
+@@ -681,6 +681,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
+     ``ca_cert_dir``, and ``ssl_version`` are only used if :mod:`ssl` is
+     available and are fed into :meth:`urllib3.util.ssl_wrap_socket` to upgrade
+     the connection socket into an SSL socket.
 +
 +    On Debian, SSL certificate validation is required by default
      """
  
      scheme = 'https'
-@@ -688,8 +690,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
+@@ -690,8 +692,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
                   strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
                   block=False, headers=None, retries=None,
                   _proxy=None, _proxy_headers=None,
@@ -35,5 +35,5 @@ index 0750e24..fe2f546 100644
 +                 key_file=None, cert_file=None, cert_reqs='CERT_REQUIRED',
 +                 ca_certs='/etc/ssl/certs/ca-certificates.crt', ssl_version=None,
                   assert_hostname=None, assert_fingerprint=None,
-                  **conn_kw):
+                  ca_cert_dir=None, **conn_kw):
  
diff --git a/debian/patches/03_force_setuptools.patch b/debian/patches/03_force_setuptools.patch
index eac0ab9..b1b3234 100644
--- a/debian/patches/03_force_setuptools.patch
+++ b/debian/patches/03_force_setuptools.patch
@@ -1,4 +1,4 @@
-From dc99fcbaf17c2d80172632cfcee0ed47762b9ccd Mon Sep 17 00:00:00 2001
+From a89ef67cc90bdfc8d4832cdd07baed149bdffd88 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 8f23e88..bec12aa 100644
--- a/debian/patches/04_relax_nosetests_options.patch
+++ b/debian/patches/04_relax_nosetests_options.patch
@@ -1,4 +1,4 @@
-From 4c635f6a22f63cb8ae21916bda23ce7987953630 Mon Sep 17 00:00:00 2001
+From 966d73488bc803f437395d8337bd322a0016084f 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 b440988..9bb55f6 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 7b1a10be6a3f7b3d3765abce6da5e37bace9a80d Mon Sep 17 00:00:00 2001
+From 797a60975f0ff4dcf615fca6f8b51ce62e5e91a6 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
index 5bea26b..435b6bb 100644
--- 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
@@ -1,4 +1,4 @@
-From 6037bb76fda33e09811e44f56bf3dcc73daeebc4 Mon Sep 17 00:00:00 2001
+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.
@@ -7,39 +7,15 @@ Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3
 
 Patch-Name: 06_rely-on-six-to-import-httplib-or-http.client.patch
 ---
- urllib3/response.py      | 5 +----
- urllib3/util/response.py | 5 +----
- 2 files changed, 2 insertions(+), 8 deletions(-)
+ urllib3/util/response.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/urllib3/response.py b/urllib3/response.py
-index 64273db..c41bd2c 100644
---- a/urllib3/response.py
-+++ b/urllib3/response.py
-@@ -1,7 +1,3 @@
--try:
--    import http.client as httplib
--except ImportError:
--    import httplib
- from contextlib import contextmanager
- import zlib
- import io
-@@ -12,6 +8,7 @@ from .exceptions import (
-     ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
- )
- from six import string_types as basestring, binary_type, PY3
-+from six.moves import http_client as httplib
- from .connection import HTTPException, BaseSSLError
- from .util.response import is_fp_closed, is_response_to_head
- 
 diff --git a/urllib3/util/response.py b/urllib3/util/response.py
-index 767ee15..6695809 100644
+index 2c1de15..6695809 100644
 --- a/urllib3/util/response.py
 +++ b/urllib3/util/response.py
-@@ -1,7 +1,4 @@
--try:
--    import http.client as httplib
--except ImportError:
--    import httplib
+@@ -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