[Python-modules-commits] [python-urllib3] 07/15: merge patched into master
Ondrej Novy
onovy at debian.org
Mon Dec 11 22:11:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-urllib3.
commit 1331071737fd9a79765b3e80c7c174f01551c8c4
Merge: 13bb3a6 6e900a4
Author: Ondřej Nový <onovy at debian.org>
Date: Mon Dec 11 21:53:37 2017 +0100
merge patched into master
CHANGES.rst | 17 +
CONTRIBUTORS.txt | 3 +
PKG-INFO | 27 +-
debian/.git-dpm | 6 +-
.../01_do-not-use-embedded-python-six.patch | 56 +-
debian/patches/02_require-cert-verification.patch | 8 +-
debian/patches/04_relax_nosetests_options.patch | 4 +-
.../05_avoid-embedded-ssl-match-hostname.patch | 2 +-
dev-requirements.txt | 3 +
docs/requirements.txt | 1 +
dummyserver/handlers.py | 3 +
setup.cfg | 2 +-
setup.py | 9 +
test/appengine/__init__.py | 71 ---
test/appengine/app.yaml | 11 -
test/appengine/conftest.py | 72 +++
test/appengine/nose.cfg | 4 -
test/appengine/requirements.txt | 1 -
test/{contrib => appengine}/test_gae_manager.py | 97 ++--
test/appengine/test_urlfetch.py | 54 +-
test/contrib/test_socks.py | 3 +
test/test_collections.py | 348 ++++++------
test/test_compatibility.py | 25 +-
test/test_connection.py | 26 +-
test/test_connectionpool.py | 452 ++++++++-------
test/test_exceptions.py | 67 +--
test/test_fields.py | 42 +-
test/test_filepost.py | 90 ++-
test/test_proxymanager.py | 68 +--
test/test_queue_monkeypatch.py | 24 +-
test/test_response.py | 311 ++++++-----
test/test_retry.py | 171 +++---
test/test_util.py | 604 ++++++++++-----------
test/with_dummyserver/test_connectionpool.py | 58 ++
test/with_dummyserver/test_https.py | 61 ++-
test/with_dummyserver/test_poolmanager.py | 1 +
test/with_dummyserver/test_proxy_poolmanager.py | 17 +-
test/with_dummyserver/test_socketlevel.py | 140 ++++-
urllib3/__init__.py | 2 +-
urllib3/_collections.py | 9 +-
urllib3/connectionpool.py | 58 +-
urllib3/contrib/_securetransport/bindings.py | 3 +
urllib3/contrib/pyopenssl.py | 11 +-
urllib3/contrib/securetransport.py | 3 +
urllib3/response.py | 4 +
urllib3/util/ssl_.py | 6 +-
46 files changed, 1610 insertions(+), 1445 deletions(-)
diff --cc debian/.git-dpm
index 4e2a62f,0000000..abbe519
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
- ddf0645459fd4966860380c777cc6a79700a881d
- ddf0645459fd4966860380c777cc6a79700a881d
- 6dde9b057102818141f6e8dc08be3f479d082724
++6e900a4ee5e1cf6acbf503986286421840c28ffd
++6e900a4ee5e1cf6acbf503986286421840c28ffd
++f42e59e953528206c93c29f8da8ca03463e3fcfc
+f42e59e953528206c93c29f8da8ca03463e3fcfc
+python-urllib3_1.22.orig.tar.gz
+02c623c3bdceda4ef5bffdafdda472d2d9e34ef1
+226083
+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 01a67e5,0000000..9126559
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,421 -1,0 +1,421 @@@
- From c98d95645c5a2f028d74c26c088a835bbe592ddc Mon Sep 17 00:00:00 2001
++From c70d98d82f50f7e46c9d71265ac86a6ddfe015f7 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
+
+fix six
+---
+ dummyserver/handlers.py | 6 +++---
+ test/__init__.py | 2 +-
+ test/test_collections.py | 2 +-
+ test/test_connectionpool.py | 4 ++--
+ test/test_fields.py | 2 +-
+ test/test_filepost.py | 2 +-
+ test/test_queue_monkeypatch.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 | 4 ++--
+ test/with_dummyserver/test_https.py | 2 +-
+ urllib3/_collections.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/request.py | 2 +-
+ urllib3/response.py | 4 ++--
+ urllib3/util/request.py | 2 +-
+ urllib3/util/response.py | 2 +-
+ urllib3/util/retry.py | 2 +-
+ 27 files changed, 37 insertions(+), 37 deletions(-)
+
+diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
- index 44f5cda..bacf31a 100644
++index a943b83..6ee6e01 100644
+--- a/dummyserver/handlers.py
++++ b/dummyserver/handlers.py
+@@ -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__)
+
- @@ -308,7 +308,7 @@ def _parse_header(line):
++@@ -311,7 +311,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 1983040..72ed38c 100644
+--- a/test/__init__.py
++++ b/test/__init__.py
+@@ -9,7 +9,7 @@ import platform
+ from nose.plugins.skip import SkipTest
+
+ from urllib3.exceptions import HTTPWarning
+-from urllib3.packages import six
++import six
+ from urllib3.util import ssl_
+
+ # We need a host that will not immediately close the connection with a TCP
+diff --git a/test/test_collections.py b/test/test_collections.py
- index ce9c8ae..0078c73 100644
++index 98c202b..5331168 100644
+--- a/test/test_collections.py
++++ b/test/test_collections.py
- @@ -6,7 +6,7 @@ from urllib3._collections import (
++@@ -4,7 +4,7 @@ from urllib3._collections import (
+ )
- from nose.plugins.skip import SkipTest
++ import pytest
+
+-from urllib3.packages import six
++import six
+ xrange = six.moves.xrange
+
+
+diff --git a/test/test_connectionpool.py b/test/test_connectionpool.py
- index 8836e9a..df84eb5 100644
++index d8b8a83..952bb84 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 f531d9e..6ad6437 100644
++index e944ec4..ed961f3 100644
+--- a/test/test_fields.py
++++ b/test/test_fields.py
+@@ -1,7 +1,7 @@
- import unittest
++ import pytest
+
+ from urllib3.fields import guess_content_type, RequestField
+-from urllib3.packages.six import u
++from six import u
+ from . import onlyPy2
+
+
+diff --git a/test/test_filepost.py b/test/test_filepost.py
- index f744a96..4d3eaf3 100644
++index ddf1209..c686ca5 100644
+--- a/test/test_filepost.py
++++ b/test/test_filepost.py
- @@ -2,7 +2,7 @@ import unittest
++@@ -2,7 +2,7 @@ import pytest
+
+ 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_queue_monkeypatch.py b/test/test_queue_monkeypatch.py
- index 2f50b90..867d951 100644
++index 8ead9c0..ce579e9 100644
+--- a/test/test_queue_monkeypatch.py
++++ b/test/test_queue_monkeypatch.py
- @@ -5,7 +5,7 @@ import sys
++@@ -6,7 +6,7 @@ import pytest
+
- import urllib3
++ from urllib3 import HTTPConnectionPool
+ from urllib3.exceptions import EmptyPoolError
+-from urllib3.packages.six.moves import queue
++from six.moves import queue
+
- if sys.version_info >= (2, 7):
- import unittest
++
++ class BadError(Exception):
+diff --git a/test/test_response.py b/test/test_response.py
- index 5146b1f..ed5f45c 100644
++index 9ec029f..11e0e10 100644
+--- a/test/test_response.py
++++ b/test/test_response.py
- @@ -7,7 +7,7 @@ from urllib3.response import HTTPResponse
++@@ -8,7 +8,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 dbe4dc0..9f631b6 100644
++index 9181f7c..924e63f 100644
+--- a/test/test_retry.py
++++ b/test/test_retry.py
+@@ -1,7 +1,7 @@
- import unittest
++ import pytest
+
+ from urllib3.response import HTTPResponse
+-from urllib3.packages.six.moves import xrange
++from six.moves import xrange
+ 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 812aae7..0d62c41 100644
++index 8cbb2a5..dfef3a2 100644
+--- a/test/test_util.py
++++ b/test/test_util.py
+@@ -38,7 +38,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 ba5251b..2de4a04 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 6da64ee..8990c99 100644
++index cf46392..92b1f66 100644
+--- a/test/with_dummyserver/test_connectionpool.py
++++ b/test/with_dummyserver/test_connectionpool.py
+@@ -25,8 +25,8 @@ from urllib3.exceptions import (
+ NewConnectionError,
+ UnrewindableBodyError,
+ )
+-from urllib3.packages.six import b, u
+-from urllib3.packages.six.moves.urllib.parse import urlencode
++from six import b, u
++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 9e3de75..08bc4f6 100644
++index dbebbea..2f2f3b1 100644
+--- a/test/with_dummyserver/test_https.py
++++ b/test/with_dummyserver/test_https.py
- @@ -37,7 +37,7 @@ from urllib3.exceptions import (
- SystemTimeWarning,
++@@ -38,7 +38,7 @@ from urllib3.exceptions import (
+ InsecurePlatformWarning,
++ MaxRetryError,
+ )
+-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 4849dde..8d0df8f 100644
++index 5df2372..7330d3f 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 c0d8329..cf72daf 100644
+--- a/urllib3/connection.py
++++ b/urllib3/connection.py
+@@ -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: # Compiled with SSL?
+ import ssl
+diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
- index b4f1166..d32419f 100644
++index ec9600f..7c8b286 100644
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
+@@ -24,8 +24,8 @@ from .exceptions import (
+ NewConnectionError,
+ )
+ from .packages.ssl_match_hostname import CertificateError
+-from .packages import six
+-from .packages.six.moves import queue
++import six
++from six.moves import queue
+ from .connection import (
+ port_by_scheme,
+ DummyConnection,
+diff --git a/urllib3/contrib/appengine.py b/urllib3/contrib/appengine.py
+index 814b022..825adfa 100644
+--- a/urllib3/contrib/appengine.py
++++ b/urllib3/contrib/appengine.py
+@@ -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 6c4be58..515113c 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 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 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 4ae9174..572815c 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/request.py b/urllib3/request.py
+index c0fddff..c07df67 100644
+--- a/urllib3/request.py
++++ b/urllib3/request.py
+@@ -1,7 +1,7 @@
+ from __future__ import absolute_import
+
+ from .filepost import encode_multipart_formdata
+-from .packages.six.moves.urllib.parse import urlencode
++from six.moves.urllib.parse import urlencode
+
+
+ __all__ = ['RequestMethods']
+diff --git a/urllib3/response.py b/urllib3/response.py
- index 408d999..59c6e63 100644
++index d3e5a1e..a8c8a0e 100644
+--- a/urllib3/response.py
++++ b/urllib3/response.py
+@@ -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 3ddfcd5..da1249e 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, integer_types
++from six import b, integer_types
+ from ..exceptions import UnrewindableBodyError
+
+ ACCEPT_ENCODING = 'gzip,deflate'
+diff --git a/urllib3/util/response.py b/urllib3/util/response.py
+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 c603cb4..e8a04a1 100644
+--- a/urllib3/util/retry.py
++++ b/urllib3/util/retry.py
+@@ -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 c95fa30,0000000..5d421c2
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 c717d5c726d5f3033a698e643269850a94f11f8a Mon Sep 17 00:00:00 2001
++From 593b1587abf352a27e1d0d47933ba683252af884 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 d32419f..9a7ab95 100644
++index 7c8b286..90b53a0 100644
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
- @@ -744,6 +744,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
++@@ -750,6 +750,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'
- @@ -753,8 +755,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
++@@ -759,8 +761,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 d43bb9c,0000000..d1c2796
mode 100644,000000..100644
--- a/debian/patches/04_relax_nosetests_options.patch
+++ b/debian/patches/04_relax_nosetests_options.patch
@@@ -1,26 -1,0 +1,26 @@@
- From b132bdaaba47f8be0a85870362aee9d7bc9ffb08 Mon Sep 17 00:00:00 2001
++From 9eb3d3646a00be9087072cc6aca7d6d1cc3e35c1 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 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
- index e585a59..4bd8576 100644
++index b3b22f9..c0f990c 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,5 +1,5 @@
+ [nosetests]
+-logging-clear-handlers = true
++# logging-clear-handlers = true
+ with-coverage = true
+ cover-package = urllib3
+ cover-erase = true
diff --cc debian/patches/05_avoid-embedded-ssl-match-hostname.patch
index 9957791,0000000..fabd12a
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 ddf0645459fd4966860380c777cc6a79700a881d Mon Sep 17 00:00:00 2001
++From 6e900a4ee5e1cf6acbf503986286421840c28ffd 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