[Python-modules-commits] [python-urllib3] 08/13: merge patched into master
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Tue Dec 6 00:15:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
eriol-guest pushed a commit to branch master
in repository python-urllib3.
commit 9ac36d8972e5aaeec4ae95b3bb6e42409f7e7bc2
Merge: 46ef323 522ffde
Author: Daniele Tricoli <eriol at mornie.org>
Date: Tue Dec 6 01:06:14 2016 +0100
merge patched into master
CHANGES.rst | 100 +++++
CONTRIBUTORS.txt | 10 +
Makefile | 20 +-
PKG-INFO | 250 ++++++------
README.rst | 170 +++------
debian/.git-dpm | 6 +-
.../01_do-not-use-embedded-python-six.patch | 190 +++++++--
debian/patches/02_require-cert-verification.patch | 8 +-
debian/patches/04_relax_nosetests_options.patch | 14 +-
.../05_avoid-embedded-ssl-match-hostname.patch | 2 +-
docs/Makefile | 2 +-
docs/README | 14 -
docs/_templates/fonts.html | 1 +
docs/advanced-usage.rst | 265 +++++++++++++
docs/collections.rst | 13 -
docs/conf.py | 52 ++-
docs/contrib.rst | 102 -----
docs/contributing.rst | 83 ++++
docs/doc-requirements.txt | 12 -
docs/exceptions.rst | 9 -
docs/helpers.rst | 57 ---
docs/index.rst | 424 +++------------------
docs/managers.rst | 131 -------
docs/pools.rst | 86 -----
docs/recipes.rst | 41 --
docs/reference/index.rst | 90 +++++
docs/reference/urllib3.contrib.rst | 37 ++
docs/reference/urllib3.util.rst | 70 ++++
docs/requirements.txt | 4 +
docs/security.rst | 262 -------------
docs/user-guide.rst | 417 ++++++++++++++++++++
dummyserver/certs/server.ip_san.crt | 21 +
dummyserver/handlers.py | 50 ++-
dummyserver/proxy.py | 1 +
dummyserver/server.py | 8 +
setup.cfg | 12 +-
setup.py | 22 +-
test/contrib/test_gae_manager.py | 31 +-
test/contrib/test_pyopenssl.py | 39 +-
test/test_connectionpool.py | 11 +-
test/test_fields.py | 9 +
test/test_response.py | 105 ++++-
test/test_retry.py | 50 ++-
test/test_util.py | 100 ++++-
test/with_dummyserver/test_chunked_transfer.py | 26 ++
test/with_dummyserver/test_connectionpool.py | 107 +++++-
test/with_dummyserver/test_https.py | 124 +++---
test/with_dummyserver/test_proxy_poolmanager.py | 10 +
test/with_dummyserver/test_socketlevel.py | 100 +++++
urllib3/__init__.py | 3 +-
urllib3/connection.py | 88 +++--
urllib3/connectionpool.py | 45 ++-
urllib3/contrib/appengine.py | 109 ++++--
urllib3/contrib/ntlmpool.py | 7 +-
urllib3/contrib/pyopenssl.py | 309 +++++++++------
urllib3/contrib/socks.py | 16 +-
urllib3/exceptions.py | 32 ++
urllib3/fields.py | 2 +-
urllib3/filepost.py | 2 +-
urllib3/packages/ssl_match_hostname/__init__.py | 8 +-
.../packages/ssl_match_hostname/_implementation.py | 58 ++-
urllib3/poolmanager.py | 8 +-
urllib3/request.py | 5 +-
urllib3/response.py | 100 ++++-
urllib3/util/connection.py | 1 +
urllib3/util/response.py | 7 +
urllib3/util/retry.py | 110 +++++-
urllib3/util/ssl_.py | 40 +-
urllib3/util/timeout.py | 15 +-
urllib3/util/url.py | 19 +-
70 files changed, 2974 insertions(+), 1778 deletions(-)
diff --cc debian/.git-dpm
index f14e1fe,0000000..eba101c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- a01056b36ac83a9fcc63af98f71ab81852864163
- a01056b36ac83a9fcc63af98f71ab81852864163
- a7f3c701b341965dfb3552fb223023dd5bd9e99b
++522ffdefa6dde0df2ca60f2bf50c12c5ee5c87f9
++522ffdefa6dde0df2ca60f2bf50c12c5ee5c87f9
++0dbe96444faad3b0e3c39c482d8a7244cc7f9a8d
+0dbe96444faad3b0e3c39c482d8a7244cc7f9a8d
+python-urllib3_1.19.1.orig.tar.gz
+aaa708899894cfc6e59e8e1abe8768dc9449b0a4
+187416
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/01_do-not-use-embedded-python-six.patch
index 122a908,0000000..c6e3665
mode 100644,000000..100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@@ -1,291 -1,0 +1,405 @@@
- From 7a66629e44973c2e0de3ee0d902100a557455ee9 Mon Sep 17 00:00:00 2001
++From f7c33240d2b780de08b6b483c46d43f6b8d21aac Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol at mornie.org>
+Date: Thu, 8 Oct 2015 13:19:46 -0700
+Subject: Do not use embedded copy of python-six.
+
+Forwarded: not-needed
+
+Patch-Name: 01_do-not-use-embedded-python-six.patch
+---
- dummyserver/handlers.py | 2 +-
++ dummyserver/handlers.py | 6 +++---
+ test/__init__.py | 2 +-
+ test/contrib/test_pyopenssl.py | 2 +-
+ test/test_collections.py | 2 +-
++ test/test_connectionpool.py | 4 ++--
+ test/test_fields.py | 2 +-
+ test/test_filepost.py | 2 +-
++ test/test_response.py | 2 +-
+ test/test_retry.py | 2 +-
++ test/test_util.py | 2 +-
+ test/with_dummyserver/test_chunked_transfer.py | 2 +-
- test/with_dummyserver/test_connectionpool.py | 2 +-
++ test/with_dummyserver/test_connectionpool.py | 4 ++--
+ test/with_dummyserver/test_https.py | 2 +-
+ urllib3/_collections.py | 2 +-
- urllib3/connection.py | 2 +-
- urllib3/connectionpool.py | 2 +-
- urllib3/contrib/appengine.py | 2 +-
++ urllib3/connection.py | 6 +++---
++ urllib3/connectionpool.py | 4 ++--
++ urllib3/contrib/appengine.py | 4 ++--
++ urllib3/contrib/ntlmpool.py | 2 +-
++ urllib3/exceptions.py | 2 +-
+ urllib3/fields.py | 2 +-
+ urllib3/filepost.py | 4 ++--
++ urllib3/poolmanager.py | 2 +-
+ urllib3/response.py | 4 ++--
+ urllib3/util/request.py | 2 +-
+ urllib3/util/response.py | 2 +-
+ urllib3/util/retry.py | 2 +-
- 20 files changed, 22 insertions(+), 22 deletions(-)
++ 26 files changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
- index 7598329..504b998 100644
++index bc6ad94..f51b371 100644
+--- a/dummyserver/handlers.py
++++ b/dummyserver/handlers.py
- @@ -269,7 +269,7 @@ def _parse_header(line):
++@@ -15,8 +15,8 @@ from tornado import httputil
++ from datetime import datetime
++ from datetime import timedelta
++
++-from urllib3.packages.six.moves.http_client import responses
++-from urllib3.packages.six.moves.urllib.parse import urlsplit
+++from six.moves.http_client import responses
+++from six.moves.urllib.parse import urlsplit
++
++ log = logging.getLogger(__name__)
++
++@@ -304,7 +304,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 bab39ed..076cdf0 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 ab304f8..b9e6572 100644
++index e88edde..376b445 100644
+--- a/test/contrib/test_pyopenssl.py
++++ b/test/contrib/test_pyopenssl.py
- @@ -1,5 +1,5 @@
++@@ -2,7 +2,7 @@
++ import unittest
++
+ from nose.plugins.skip import SkipTest
+-from urllib3.packages import six
++import six
+
+ try:
+ from urllib3.contrib.pyopenssl import (inject_into_urllib3,
+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_connectionpool.py b/test/test_connectionpool.py
++index 2fab0c6..4d8f7de 100644
++--- a/test/test_connectionpool.py
+++++ b/test/test_connectionpool.py
++@@ -10,8 +10,8 @@ from urllib3.connectionpool import (
++ )
++ from urllib3.response import httplib, HTTPResponse
++ from urllib3.util.timeout import Timeout
++-from urllib3.packages.six.moves.http_client import HTTPException
++-from urllib3.packages.six.moves.queue import Empty
+++from six.moves.http_client import HTTPException
+++from six.moves.queue import Empty
++ from urllib3.packages.ssl_match_hostname import CertificateError
++ from urllib3.exceptions import (
++ ClosedPoolError,
+diff --git a/test/test_fields.py b/test/test_fields.py
- index 21b4481..b547aa8 100644
++index 27dad92..61b9b9c 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, PY3
++from six import u, PY3
+ from . import onlyPy2
+
+
+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_response.py b/test/test_response.py
++index 10aa410..e3ea351 100644
++--- a/test/test_response.py
+++++ b/test/test_response.py
++@@ -7,7 +7,7 @@ from urllib3.response import HTTPResponse
++ from urllib3.exceptions import (
++ DecodeError, ResponseNotChunked, ProtocolError, InvalidHeader
++ )
++-from urllib3.packages.six.moves import http_client as httplib
+++from six.moves import http_client as httplib
++ from urllib3.util.retry import Retry
++ from urllib3.util.response import is_fp_closed
++
+diff --git a/test/test_retry.py b/test/test_retry.py
- index 1e87585..48bad37 100644
++index 550dbfc..c57b48e 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.util.retry import Retry, RequestHistory
+ from urllib3.exceptions import (
+ ConnectTimeoutError,
++diff --git a/test/test_util.py b/test/test_util.py
++index 23a9fe2..e0b1f1d 100644
++--- a/test/test_util.py
+++++ b/test/test_util.py
++@@ -37,7 +37,7 @@ from urllib3.util.connection import (
++ _has_ipv6
++ )
++ from urllib3.util import is_fp_closed, ssl_
++-from urllib3.packages import six
+++import six
++
++ from . import clear_warnings
++
+diff --git a/test/with_dummyserver/test_chunked_transfer.py b/test/with_dummyserver/test_chunked_transfer.py
- index 1d58e23..abfc777 100644
++index 04f4f8b..866689c 100644
+--- a/test/with_dummyserver/test_chunked_transfer.py
++++ b/test/with_dummyserver/test_chunked_transfer.py
+@@ -1,7 +1,7 @@
+ # -*- coding: utf-8 -*-
+
+ from urllib3 import HTTPConnectionPool
+-from urllib3.packages import six
++import six
+ from dummyserver.testcase import SocketDummyServerTestCase
+
+
+diff --git a/test/with_dummyserver/test_connectionpool.py b/test/with_dummyserver/test_connectionpool.py
- index 0f31fa0..b3b72ca 100644
++index e98258c..cd21496 100644
+--- a/test/with_dummyserver/test_connectionpool.py
++++ b/test/with_dummyserver/test_connectionpool.py
- @@ -31,7 +31,7 @@ from urllib3.exceptions import (
++@@ -29,8 +29,8 @@ from urllib3.exceptions import (
+ ProtocolError,
+ NewConnectionError,
+ )
+-from urllib3.packages.six import b, u
++-from urllib3.packages.six.moves.urllib.parse import urlencode
++from six import b, u
- from urllib3.util.retry import Retry
+++from six.moves.urllib.parse import urlencode
++ from urllib3.util.retry import Retry, RequestHistory
+ from urllib3.util.timeout import Timeout
+
+diff --git a/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py
- index 2c5f035..be54e3c 100644
++index dc9b1f7..34473ab 100644
+--- a/test/with_dummyserver/test_https.py
++++ b/test/with_dummyserver/test_https.py
- @@ -36,7 +36,7 @@ from urllib3.exceptions import (
++@@ -37,7 +37,7 @@ from urllib3.exceptions import (
+ SystemTimeWarning,
+ InsecurePlatformWarning,
+ )
+-from urllib3.packages import six
++import six
+ from urllib3.util.timeout import Timeout
+ import urllib3.util as util
+
+diff --git a/urllib3/_collections.py b/urllib3/_collections.py
+index 77cee01..114116c 100644
+--- a/urllib3/_collections.py
++++ b/urllib3/_collections.py
+@@ -15,7 +15,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 5ce0080..f4b86fa 100644
++index e24f5e3..568eb88 100644
+--- a/urllib3/connection.py
++++ b/urllib3/connection.py
- @@ -6,7 +6,7 @@ import sys
++@@ -6,9 +6,9 @@ import sys
+ import socket
+ from socket import error as SocketError, timeout as SocketTimeout
+ import warnings
+-from .packages import six
++-from .packages.six.moves.http_client import HTTPConnection as _HTTPConnection
++-from .packages.six.moves.http_client import HTTPException # noqa: F401
++import six
+++from six.moves.http_client import HTTPConnection as _HTTPConnection
+++from six.moves.http_client import HTTPException # noqa: F401
+
- try: # Python 3
- from http.client import HTTPConnection as _HTTPConnection
++ try: # Compiled with SSL?
++ import ssl
+diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
- index ab634cb..652b297 100644
++index 19d08f2..ad8f35a 100644
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
- @@ -31,7 +31,7 @@ from .exceptions import (
++@@ -24,8 +24,8 @@ from .exceptions import (
+ NewConnectionError,
+ )
+ from .packages.ssl_match_hostname import CertificateError
+-from .packages import six
++-from .packages.six.moves.queue import LifoQueue, Empty, Full
++import six
+++from six.moves.queue import LifoQueue, Empty, Full
+ from .connection import (
+ port_by_scheme,
+ DummyConnection,
+diff --git a/urllib3/contrib/appengine.py b/urllib3/contrib/appengine.py
- index 1579476..22e76e0 100644
++index c3249ee..fea7cb2 100644
+--- a/urllib3/contrib/appengine.py
++++ b/urllib3/contrib/appengine.py
- @@ -12,7 +12,7 @@ from ..exceptions import (
++@@ -42,7 +42,7 @@ from __future__ import absolute_import
++ import logging
++ import os
++ import warnings
++-from ..packages.six.moves.urllib.parse import urljoin
+++from six.moves.urllib.parse import urljoin
++
++ from ..exceptions import (
++ HTTPError,
++@@ -53,7 +53,7 @@ from ..exceptions import (
+ SSLError
+ )
+
+-from ..packages.six import BytesIO
++from six import BytesIO
+ from ..request import RequestMethods
+ from ..response import HTTPResponse
+ from ..util.timeout import Timeout
++diff --git a/urllib3/contrib/ntlmpool.py b/urllib3/contrib/ntlmpool.py
++index 642e99e..bf2ec3e 100644
++--- a/urllib3/contrib/ntlmpool.py
+++++ b/urllib3/contrib/ntlmpool.py
++@@ -9,7 +9,7 @@ from logging import getLogger
++ from ntlm import ntlm
++
++ from .. import HTTPSConnectionPool
++-from ..packages.six.moves.http_client import HTTPSConnection
+++from six.moves.http_client import HTTPSConnection
++
++
++ log = getLogger(__name__)
++diff --git a/urllib3/exceptions.py b/urllib3/exceptions.py
++index 8a091c1..58ba5d0 100644
++--- a/urllib3/exceptions.py
+++++ b/urllib3/exceptions.py
++@@ -1,5 +1,5 @@
++ from __future__ import absolute_import
++-from .packages.six.moves.http_client import (
+++from six.moves.http_client import (
++ IncompleteRead as httplib_IncompleteRead
++ )
++ # Base Exceptions
+diff --git a/urllib3/fields.py b/urllib3/fields.py
- index 8fa2a12..14e5604 100644
++index 19b0ae0..79e4236 100644
+--- a/urllib3/fields.py
++++ b/urllib3/fields.py
+@@ -2,7 +2,7 @@ from __future__ import absolute_import
+ 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 97a2843..2fea190 100644
++index cd11cee..8256115 100644
+--- a/urllib3/filepost.py
++++ b/urllib3/filepost.py
+@@ -4,8 +4,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/poolmanager.py b/urllib3/poolmanager.py
++index 276b54d..fde0cd4 100644
++--- a/urllib3/poolmanager.py
+++++ b/urllib3/poolmanager.py
++@@ -7,7 +7,7 @@ from ._collections import RecentlyUsedContainer
++ from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool
++ from .connectionpool import port_by_scheme
++ from .exceptions import LocationValueError, MaxRetryError, ProxySchemeUnknown
++-from .packages.six.moves.urllib.parse import urljoin
+++from six.moves.urllib.parse import urljoin
++ from .request import RequestMethods
++ from .util.url import parse_url
++ from .util.retry import Retry
+diff --git a/urllib3/response.py b/urllib3/response.py
- index 5567903..10e14ec 100644
++index 6f1b63c..38640dc 100644
+--- a/urllib3/response.py
++++ b/urllib3/response.py
- @@ -9,8 +9,8 @@ from ._collections import HTTPHeaderDict
- from .exceptions import (
- ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
++@@ -11,8 +11,8 @@ from .exceptions import (
++ BodyNotHttplibCompatible, ProtocolError, DecodeError, ReadTimeoutError,
++ ResponseNotChunked, IncompleteRead, InvalidHeader
+ )
+-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/urllib3/util/request.py b/urllib3/util/request.py
+index 7377931..40bf0b4 100644
+--- a/urllib3/util/request.py
++++ b/urllib3/util/request.py
+@@ -1,7 +1,7 @@
+ from __future__ import absolute_import
+ 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 0b5c75c..d7759ae 100644
++index 67cf730..9be555f 100644
+--- a/urllib3/util/response.py
++++ b/urllib3/util/response.py
+@@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-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 d379833..c2e5380 100644
++index 47ad539..19f0380 100644
+--- a/urllib3/util/retry.py
++++ b/urllib3/util/retry.py
- @@ -9,7 +9,7 @@ from ..exceptions import (
- ReadTimeoutError,
++@@ -14,7 +14,7 @@ from ..exceptions import (
+ ResponseError,
++ InvalidHeader,
+ )
+-from ..packages import six
++import six
+
+
+ log = logging.getLogger(__name__)
diff --cc debian/patches/02_require-cert-verification.patch
index 35ad3fa,0000000..6a7c102
mode 100644,000000..100644
--- a/debian/patches/02_require-cert-verification.patch
+++ b/debian/patches/02_require-cert-verification.patch
@@@ -1,39 -1,0 +1,39 @@@
- From 560678e666eca5ae53603e19961083171e589675 Mon Sep 17 00:00:00 2001
++From 2be2c5a79b30c2ff65e127735ed2c050e3c3c54f Mon Sep 17 00:00:00 2001
+From: Jamie Strandboge <jamie at 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 652b297..38e56ff 100644
++index ad8f35a..a3a328e 100644
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
- @@ -730,6 +730,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
++@@ -735,6 +735,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'
- @@ -739,8 +741,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
++@@ -744,8 +746,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,
+ ca_cert_dir=None, **conn_kw):
+
diff --cc debian/patches/04_relax_nosetests_options.patch
index ee37cb2,0000000..f2fc743
mode 100644,000000..100644
--- a/debian/patches/04_relax_nosetests_options.patch
+++ b/debian/patches/04_relax_nosetests_options.patch
@@@ -1,30 -1,0 +1,26 @@@
- From 2671c5c6d63d596af6d5e814f755740c55da8813 Mon Sep 17 00:00:00 2001
++From d19b1c6e7a1752101a52f9d9dcb8acbefb6ac3d5 Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol at 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.
+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(-)
++ setup.cfg | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
- index 972e02c..4fabdbe 100644
++index fbaace4..0cdcef9 100644
+--- a/setup.cfg
++++ b/setup.cfg
- @@ -1,8 +1,8 @@
++@@ -1,5 +1,5 @@
+ [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 --cc debian/patches/05_avoid-embedded-ssl-match-hostname.patch
index 63a2b84,0000000..9be7201
mode 100644,000000..100644
--- a/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
+++ b/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
@@@ -1,34 -1,0 +1,34 @@@
- From a01056b36ac83a9fcc63af98f71ab81852864163 Mon Sep 17 00:00:00 2001
++From 522ffdefa6dde0df2ca60f2bf50c12c5ee5c87f9 Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefanor at 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.
+Forwarded: not-needed
+Last-Update: 2014-11-18
+
+Patch-Name: 05_avoid-embedded-ssl-match-hostname.patch
+---
+ urllib3/packages/__init__.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/urllib3/packages/__init__.py b/urllib3/packages/__init__.py
+index 170e974..4a39b72 100644
+--- a/urllib3/packages/__init__.py
++++ b/urllib3/packages/__init__.py
+@@ -1,5 +1,11 @@
+ from __future__ import absolute_import
+
+-from . import ssl_match_hostname
+-
+ __all__ = ('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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-urllib3.git
More information about the Python-modules-commits
mailing list