Initialize git-dpm

26 files changed, 258 insertions, 143 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 0000000..cdbc564
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+6037bb76fda33e09811e44f56bf3dcc73daeebc4
+6037bb76fda33e09811e44f56bf3dcc73daeebc4
+e6838673bda9af1e9bf7c4f71b25cf3e3dfc1253
+e6838673bda9af1e9bf7c4f71b25cf3e3dfc1253
+python-urllib3_1.11.orig.tar.gz
+789dad8b719cd1561ca4fa3dc286d0df1b129e98
+149671
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 9f4c025..24710dd 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -1,11 +1,72 @@
-Description: Do not use embedded copy of python-six.
-Author: Daniele Tricoli <eriol@mornie.org>
+From e720aa3dea81bf5c30d9a897f9cbae18bf6a4228 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
+---
+ 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            | 2 +-
+ urllib3/util/request.py        | 2 +-
+ urllib3/util/retry.py          | 2 +-
+ 15 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
+index ffa1dd3..1ee4dd7 100644
+--- a/dummyserver/handlers.py
++++ b/dummyserver/handlers.py
+@@ -261,7 +261,7 @@ def _parse_header(line):
+     """
+     import tornado.httputil
+     import email.utils
+-    from urllib3.packages import six
++    import six
+     if not six.PY3:
+         line = line.encode('utf-8')
+     parts = tornado.httputil._parseparam(';' + line)
+diff --git a/test/__init__.py b/test/__init__.py
+index 172493c..7ea6358 100644
+--- a/test/__init__.py
++++ b/test/__init__.py
+@@ -8,7 +8,7 @@ import socket
+ from nose.plugins.skip import SkipTest
+ 
+ from urllib3.exceptions import MaxRetryError, HTTPWarning
+-from urllib3.packages import six
++import six
+ 
+ # We need a host that will not immediately close the connection with a TCP
+ # Reset. SO suggests this hostname
+diff --git a/test/contrib/test_pyopenssl.py b/test/contrib/test_pyopenssl.py
+index 5d57527..f23ff19 100644
+--- a/test/contrib/test_pyopenssl.py
++++ b/test/contrib/test_pyopenssl.py
+@@ -1,5 +1,5 @@
+ from nose.plugins.skip import SkipTest
+-from urllib3.packages import six
++import six
+ 
+ if six.PY3:
+     raise SkipTest('Testing of PyOpenSSL disabled on PY3')
+diff --git a/test/test_collections.py b/test/test_collections.py
+index 9d72939..78ef634 100644
 --- a/test/test_collections.py
 +++ b/test/test_collections.py
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,7 @@ from urllib3._collections import (
      HTTPHeaderDict,
      RecentlyUsedContainer as Container
  )
@@ -14,44 +75,24 @@ Last-Update: 2015-05-03
  xrange = six.moves.xrange
  
  from nose.plugins.skip import SkipTest
---- a/urllib3/connectionpool.py
-+++ b/urllib3/connectionpool.py
-@@ -28,7 +28,7 @@
-     InsecureRequestWarning,
- )
- from .packages.ssl_match_hostname import CertificateError
--from .packages import six
-+import six
- from .connection import (
-     port_by_scheme,
-     DummyConnection,
---- a/urllib3/filepost.py
-+++ b/urllib3/filepost.py
-@@ -3,8 +3,8 @@
- from uuid import uuid4
- from io import BytesIO
+diff --git a/test/test_fields.py b/test/test_fields.py
+index cdec68b..66da148 100644
+--- a/test/test_fields.py
++++ b/test/test_fields.py
+@@ -1,7 +1,7 @@
+ import unittest
  
--from .packages import six
--from .packages.six import b
-+import six
-+from six import b
- from .fields import RequestField
+ from urllib3.fields import guess_content_type, RequestField
+-from urllib3.packages.six import u
++from six import u
  
- writer = codecs.lookup('utf-8')[3]
---- a/urllib3/response.py
-+++ b/urllib3/response.py
-@@ -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, is_response_to_head
  
+ class TestRequestField(unittest.TestCase):
+diff --git a/test/test_filepost.py b/test/test_filepost.py
+index 390dbb3..ecc6710 100644
 --- a/test/test_filepost.py
 +++ b/test/test_filepost.py
-@@ -2,7 +2,7 @@
+@@ -2,7 +2,7 @@ import unittest
  
  from urllib3.filepost import encode_multipart_formdata, iter_fields
  from urllib3.fields import RequestField
@@ -60,42 +101,24 @@ Last-Update: 2015-05-03
  
  
  BOUNDARY = '!! test boundary !!'
---- a/dummyserver/handlers.py
-+++ b/dummyserver/handlers.py
-@@ -261,7 +261,7 @@
-     """
-     import tornado.httputil
-     import email.utils
--    from urllib3.packages import six
-+    import six
-     if not six.PY3:
-         line = line.encode('utf-8')
-     parts = tornado.httputil._parseparam(';' + line)
---- a/urllib3/fields.py
-+++ b/urllib3/fields.py
-@@ -1,7 +1,7 @@
- import email.utils
- import mimetypes
- 
--from .packages import six
-+import six
- 
- 
- def guess_content_type(filename, default='application/octet-stream'):
---- a/test/test_fields.py
-+++ b/test/test_fields.py
+diff --git a/test/test_retry.py b/test/test_retry.py
+index 421e508..8fcc287 100644
+--- a/test/test_retry.py
++++ b/test/test_retry.py
 @@ -1,7 +1,7 @@
  import unittest
  
- from urllib3.fields import guess_content_type, RequestField
--from urllib3.packages.six import u
-+from six import u
- 
- 
- class TestRequestField(unittest.TestCase):
+ from urllib3.response import HTTPResponse
+-from urllib3.packages.six.moves import xrange
++from six.moves import xrange
+ from urllib3.util.retry import Retry
+ from urllib3.exceptions import (
+     ConnectTimeoutError,
+diff --git a/urllib3/_collections.py b/urllib3/_collections.py
+index b68b9a5..af8074a 100644
 --- a/urllib3/_collections.py
 +++ b/urllib3/_collections.py
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ try:  # Python 2.7+
      from collections import OrderedDict
  except ImportError:
      from .packages.ordered_dict import OrderedDict
@@ -104,9 +127,11 @@ Last-Update: 2015-05-03
  
  
  __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
+diff --git a/urllib3/connection.py b/urllib3/connection.py
+index f64dd1a..a2b8fcb 100644
 --- a/urllib3/connection.py
 +++ b/urllib3/connection.py
-@@ -3,7 +3,7 @@
+@@ -3,7 +3,7 @@ import sys
  import socket
  from socket import timeout as SocketTimeout
  import warnings
@@ -115,6 +140,62 @@ Last-Update: 2015-05-03
  
  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
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
+@@ -28,7 +28,7 @@ from .exceptions import (
+     InsecureRequestWarning,
+ )
+ from .packages.ssl_match_hostname import CertificateError
+-from .packages import six
++import six
+ from .connection import (
+     port_by_scheme,
+     DummyConnection,
+diff --git a/urllib3/fields.py b/urllib3/fields.py
+index c853f8d..5fe3c24 100644
+--- a/urllib3/fields.py
++++ b/urllib3/fields.py
+@@ -1,7 +1,7 @@
+ import email.utils
+ import mimetypes
+ 
+-from .packages import six
++import six
+ 
+ 
+ def guess_content_type(filename, default='application/octet-stream'):
+diff --git a/urllib3/filepost.py b/urllib3/filepost.py
+index 0fbf488..97ab970 100644
+--- a/urllib3/filepost.py
++++ b/urllib3/filepost.py
+@@ -3,8 +3,8 @@ import codecs
+ from uuid import uuid4
+ from io import BytesIO
+ 
+-from .packages import six
+-from .packages.six import b
++import six
++from six import b
+ from .fields import RequestField
+ 
+ writer = codecs.lookup('utf-8')[3]
+diff --git a/urllib3/response.py b/urllib3/response.py
+index 15d4aac..64273db 100644
+--- a/urllib3/response.py
++++ b/urllib3/response.py
+@@ -11,7 +11,7 @@ from ._collections import HTTPHeaderDict
+ 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, is_response_to_head
+ 
+diff --git a/urllib3/util/request.py b/urllib3/util/request.py
+index bc64f6b..5f4ccfd 100644
 --- a/urllib3/util/request.py
 +++ b/urllib3/util/request.py
 @@ -1,6 +1,6 @@
@@ -125,9 +206,11 @@ Last-Update: 2015-05-03
  
  ACCEPT_ENCODING = 'gzip,deflate'
  
+diff --git a/urllib3/util/retry.py b/urllib3/util/retry.py
+index 1fb1f23..178b374 100644
 --- a/urllib3/util/retry.py
 +++ b/urllib3/util/retry.py
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ from ..exceptions import (
      ReadTimeoutError,
      ResponseError,
  )
@@ -136,34 +219,3 @@ Last-Update: 2015-05-03
  
  
  log = logging.getLogger(__name__)
---- a/test/test_retry.py
-+++ b/test/test_retry.py
-@@ -1,7 +1,7 @@
- import unittest
- 
- from urllib3.response import HTTPResponse
--from urllib3.packages.six.moves import xrange
-+from six.moves import xrange
- from urllib3.util.retry import Retry
- from urllib3.exceptions import (
-     ConnectTimeoutError,
---- a/test/__init__.py
-+++ b/test/__init__.py
-@@ -8,7 +8,7 @@
- from nose.plugins.skip import SkipTest
- 
- from urllib3.exceptions import MaxRetryError, HTTPWarning
--from urllib3.packages import six
-+import six
- 
- # We need a host that will not immediately close the connection with a TCP
- # Reset. SO suggests this hostname
---- a/test/contrib/test_pyopenssl.py
-+++ b/test/contrib/test_pyopenssl.py
-@@ -1,5 +1,5 @@
- from nose.plugins.skip import SkipTest
--from urllib3.packages import six
-+import six
- 
- if six.PY3:
-     raise SkipTest('Testing of PyOpenSSL disabled on PY3')
diff --git a/debian/patches/02_require-cert-verification.patch b/debian/patches/02_require-cert-verification.patch
index 1b5992c..6973d7a 100644
--- a/debian/patches/02_require-cert-verification.patch
+++ b/debian/patches/02_require-cert-verification.patch
@@ -1,13 +1,23 @@
-Author: Jamie Strandboge <jamie@canonical.com>
-Description: require SSL certificate validation by default by using
+From 9cd0feeb36e835dbc9f394befd32e02ec1ce6841 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
+
  CERT_REQUIRED and using the system /etc/ssl/certs/ca-certificates.crt
 Bug-Ubuntu: https://launchpad.net/bugs/1047054
 Bug-Debian: http://bugs.debian.org/686872
 Last-Update: 2014-09-01
 
+Patch-Name: 02_require-cert-verification.patch
+---
+ urllib3/connectionpool.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
+index 0750e24..fe2f546 100644
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -628,6 +628,8 @@
+@@ -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.
@@ -16,7 +26,7 @@ Last-Update: 2014-09-01
      """
  
      scheme = 'https'
-@@ -637,8 +639,8 @@
+@@ -688,8 +690,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
                   strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
                   block=False, headers=None, retries=None,
                   _proxy=None, _proxy_headers=None,
diff --git a/debian/patches/03_force_setuptools.patch b/debian/patches/03_force_setuptools.patch
index e829b50..eac0ab9 100644
--- a/debian/patches/03_force_setuptools.patch
+++ b/debian/patches/03_force_setuptools.patch
@@ -1,8 +1,18 @@
-Author: Barry Warsaw <barry@debian.org>
-Description: Use setuptools.setup() so that the bdist_wheel
+From dc99fcbaf17c2d80172632cfcee0ed47762b9ccd 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
+
  command will work.
 Last-Update: 2014-05-15
 
+Patch-Name: 03_force_setuptools.patch
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 6bdb7b9..1e1888d 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -1,6 +1,6 @@
diff --git a/debian/patches/04_relax_nosetests_options.patch b/debian/patches/04_relax_nosetests_options.patch
index 2f7f8ff..8f23e88 100644
--- a/debian/patches/04_relax_nosetests_options.patch
+++ b/debian/patches/04_relax_nosetests_options.patch
@@ -1,10 +1,20 @@
-Description: Do not use logging-clear-handlers to see all logging output and
+From 4c635f6a22f63cb8ae21916bda23ce7987953630 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
+
  disable cover-min-percentage since it require python-nose (>= 1.3): this way
  it will be easier to backport python-urllib3 to Wheezy.
-Author: Daniele Tricoli <eriol@mornie.org>
 Forwarded: not-needed
 Last-Update: 2014-7-7
 
+Patch-Name: 04_relax_nosetests_options.patch
+---
+ setup.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 6a64ffa..25a6815 100644
 --- a/setup.cfg
 +++ b/setup.cfg
 @@ -1,8 +1,8 @@
diff --git a/debian/patches/05_avoid-embedded-ssl-match-hostname.patch b/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
index 36d65e0..b440988 100644
--- a/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
+++ b/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
@@ -1,11 +1,21 @@
-Description: Do not use embedded copy of ssl.match_hostname, when possible
+From 7b1a10be6a3f7b3d3765abce6da5e37bace9a80d 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
+
  The system python has the necessary features backported, since 2.7.8-7 (and
  221a1f9155e2, releasing in 2.7.9, upstream). However, alternative python
  implementations don't, yet, and urllib3 is used by pip in virtualenvs.
-Author: Stefano Rivera <stefanor@debian.org>
 Forwarded: not-needed
 Last-Update: 2014-11-18
 
+Patch-Name: 05_avoid-embedded-ssl-match-hostname.patch
+---
+ urllib3/packages/__init__.py | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/urllib3/packages/__init__.py b/urllib3/packages/__init__.py
+index 37e8351..10a3aa8 100644
 --- a/urllib3/packages/__init__.py
 +++ b/urllib3/packages/__init__.py
 @@ -1,4 +1,9 @@
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 a6e4282..5bea26b 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,6 +1,18 @@
-Description: Rely on six to import httplib or http.client.
+From 6037bb76fda33e09811e44f56bf3dcc73daeebc4 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/response.py      | 5 +----
+ urllib3/util/response.py | 5 +----
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+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 @@
@@ -11,7 +23,7 @@ Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3
  from contextlib import contextmanager
  import zlib
  import io
-@@ -12,6 +8,7 @@
+@@ -12,6 +8,7 @@ from .exceptions import (
      ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
  )
  from six import string_types as basestring, binary_type, PY3
@@ -19,6 +31,8 @@ Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3
  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
 --- a/urllib3/util/response.py
 +++ b/urllib3/util/response.py
 @@ -1,7 +1,4 @@
diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
index ffa1dd3..1ee4dd7 100644
--- a/dummyserver/handlers.py
+++ b/dummyserver/handlers.py
@@ -261,7 +261,7 @@ def _parse_header(line):
     """
     import tornado.httputil
     import email.utils
-    from urllib3.packages import six
+    import six
     if not six.PY3:
         line = line.encode('utf-8')
     parts = tornado.httputil._parseparam(';' + line)
diff --git a/setup.cfg b/setup.cfg
index 6a64ffa..25a6815 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,8 @@
 [nosetests]
-logging-clear-handlers = true
+# logging-clear-handlers = true
 with-coverage = true
 cover-package = urllib3
-cover-min-percentage = 100
+# cover-min-percentage = 100
 cover-erase = true
 
 [flake8]
diff --git a/setup.py b/setup.py
index 6bdb7b9..1e1888d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 
 import os
 import re
diff --git a/test/__init__.py b/test/__init__.py
index 172493c..7ea6358 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -8,7 +8,7 @@ import socket
 from nose.plugins.skip import SkipTest
 
 from urllib3.exceptions import MaxRetryError, HTTPWarning
-from urllib3.packages import six
+import six
 
 # We need a host that will not immediately close the connection with a TCP
 # Reset. SO suggests this hostname
diff --git a/test/contrib/test_pyopenssl.py b/test/contrib/test_pyopenssl.py
index 5d57527..f23ff19 100644
--- a/test/contrib/test_pyopenssl.py
+++ b/test/contrib/test_pyopenssl.py
@@ -1,5 +1,5 @@
 from nose.plugins.skip import SkipTest
-from urllib3.packages import six
+import six
 
 if six.PY3:
     raise SkipTest('Testing of PyOpenSSL disabled on PY3')
diff --git a/test/test_collections.py b/test/test_collections.py
index 9d72939..78ef634 100644
--- a/test/test_collections.py
+++ b/test/test_collections.py
@@ -4,7 +4,7 @@ from urllib3._collections import (
     HTTPHeaderDict,
     RecentlyUsedContainer as Container
 )
-from urllib3.packages import six
+import six
 xrange = six.moves.xrange
 
 from nose.plugins.skip import SkipTest
diff --git a/test/test_fields.py b/test/test_fields.py
index cdec68b..66da148 100644
--- a/test/test_fields.py
+++ b/test/test_fields.py
@@ -1,7 +1,7 @@
 import unittest
 
 from urllib3.fields import guess_content_type, RequestField
-from urllib3.packages.six import u
+from six import u
 
 
 class TestRequestField(unittest.TestCase):
diff --git a/test/test_filepost.py b/test/test_filepost.py
index 390dbb3..ecc6710 100644
--- a/test/test_filepost.py
+++ b/test/test_filepost.py
@@ -2,7 +2,7 @@ import unittest
 
 from urllib3.filepost import encode_multipart_formdata, iter_fields
 from urllib3.fields import RequestField
-from urllib3.packages.six import b, u
+from six import b, u
 
 
 BOUNDARY = '!! test boundary !!'
diff --git a/test/test_retry.py b/test/test_retry.py
index 421e508..8fcc287 100644
--- a/test/test_retry.py
+++ b/test/test_retry.py
@@ -1,7 +1,7 @@
 import unittest
 
 from urllib3.response import HTTPResponse
-from urllib3.packages.six.moves import xrange
+from six.moves import xrange
 from urllib3.util.retry import Retry
 from urllib3.exceptions import (
     ConnectTimeoutError,
diff --git a/urllib3/_collections.py b/urllib3/_collections.py
index b68b9a5..af8074a 100644
--- a/urllib3/_collections.py
+++ b/urllib3/_collections.py
@@ -14,7 +14,7 @@ try:  # Python 2.7+
     from collections import OrderedDict
 except ImportError:
     from .packages.ordered_dict import OrderedDict
-from .packages.six import iterkeys, itervalues, PY3
+from six import iterkeys, itervalues, PY3
 
 
 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
diff --git a/urllib3/connection.py b/urllib3/connection.py
index f64dd1a..a2b8fcb 100644
--- a/urllib3/connection.py
+++ b/urllib3/connection.py
@@ -3,7 +3,7 @@ import sys
 import socket
 from socket import timeout as SocketTimeout
 import warnings
-from .packages import six
+import six
 
 try:  # Python 3
     from http.client import HTTPConnection as _HTTPConnection, HTTPException
diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
index c958725..fe2f546 100644
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
@@ -28,7 +28,7 @@ from .exceptions import (
     InsecureRequestWarning,
 )
 from .packages.ssl_match_hostname import CertificateError
-from .packages import six
+import six
 from .connection import (
     port_by_scheme,
     DummyConnection,
@@ -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.
+
+    On Debian, SSL certificate validation is required by default
     """
 
     scheme = 'https'
@@ -688,8 +690,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
                  strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
                  block=False, headers=None, retries=None,
                  _proxy=None, _proxy_headers=None,
-                 key_file=None, cert_file=None, cert_reqs=None,
-                 ca_certs=None, ssl_version=None,
+                 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):
 
diff --git a/urllib3/fields.py b/urllib3/fields.py
index c853f8d..5fe3c24 100644
--- a/urllib3/fields.py
+++ b/urllib3/fields.py
@@ -1,7 +1,7 @@
 import email.utils
 import mimetypes
 
-from .packages import six
+import six
 
 
 def guess_content_type(filename, default='application/octet-stream'):
diff --git a/urllib3/filepost.py b/urllib3/filepost.py
index 0fbf488..97ab970 100644
--- a/urllib3/filepost.py
+++ b/urllib3/filepost.py
@@ -3,8 +3,8 @@ import codecs
 from uuid import uuid4
 from io import BytesIO
 
-from .packages import six
-from .packages.six import b
+import six
+from six import b
 from .fields import RequestField
 
 writer = codecs.lookup('utf-8')[3]
diff --git a/urllib3/packages/__init__.py b/urllib3/packages/__init__.py
index 37e8351..10a3aa8 100644
--- a/urllib3/packages/__init__.py
+++ b/urllib3/packages/__init__.py
@@ -1,4 +1,9 @@
 from __future__ import absolute_import
 
-from . import ssl_match_hostname
-
+try:
+    # cPython >= 2.7.9 has ssl features backported from Python3
+    from ssl import CertificateError
+    del CertificateError
+    import ssl as ssl_match_hostname
+except ImportError:
+    from . import ssl_match_hostname
diff --git a/urllib3/response.py b/urllib3/response.py
index 15d4aac..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
@@ -11,7 +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 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/request.py b/urllib3/util/request.py
index bc64f6b..5f4ccfd 100644
--- a/urllib3/util/request.py
+++ b/urllib3/util/request.py
@@ -1,6 +1,6 @@
 from base64 import b64encode
 
-from ..packages.six import b
+from six import b
 
 ACCEPT_ENCODING = 'gzip,deflate'
 
diff --git a/urllib3/util/response.py b/urllib3/util/response.py
index 767ee15..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
+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
+++ b/urllib3/util/retry.py
@@ -8,7 +8,7 @@ from ..exceptions import (
     ReadTimeoutError,
     ResponseError,
 )
-from ..packages import six
+import six
 
 
 log = logging.getLogger(__name__)