[Python-modules-commits] [python-urllib3] 08/08: merge patched into master
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Sun Sep 4 00:01:40 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 ad710f2fb3beec65b6c5b7c8aeab3b06e3d9bbce
Merge: 3049b75 a01056b
Author: Daniele Tricoli <eriol at mornie.org>
Date: Sun Sep 4 01:25:05 2016 +0200
merge patched into master
CHANGES.rst | 29 +-
CONTRIBUTORS.txt | 11 +-
PKG-INFO | 39 +-
README.rst | 6 +-
debian/.git-dpm | 6 +-
.../01_do-not-use-embedded-python-six.patch | 12 +-
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 | 1 +
docs/managers.rst | 44 ++
docs/security.rst | 2 +-
setup.cfg | 5 +-
setup.py | 2 +-
test/test_connectionpool.py | 77 +++
test/test_poolmanager.py | 230 +++++++-
test/test_retry.py | 15 +
test/test_util.py | 32 +-
test/with_dummyserver/test_socketlevel.py | 62 +-
urllib3/__init__.py | 2 +-
urllib3/connectionpool.py | 37 +-
urllib3/contrib/appengine.py | 2 +-
urllib3/contrib/socks.py | 2 +-
urllib3/packages/six.py | 635 ++++++++++++++++++---
urllib3/poolmanager.py | 93 ++-
urllib3/response.py | 4 +
urllib3/util/connection.py | 47 +-
urllib3/util/retry.py | 14 +-
urllib3/util/ssl_.py | 4 +-
29 files changed, 1288 insertions(+), 139 deletions(-)
diff --cc debian/.git-dpm
index c9b5204,0000000..3713a4f
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
- 21501b42c55182861ad7afe82d5267f442722e03
- 21501b42c55182861ad7afe82d5267f442722e03
- 9105037e3d018d407e6b6faad26ae5a8a17a732a
++a01056b36ac83a9fcc63af98f71ab81852864163
++a01056b36ac83a9fcc63af98f71ab81852864163
++a7f3c701b341965dfb3552fb223023dd5bd9e99b
+a7f3c701b341965dfb3552fb223023dd5bd9e99b
+python-urllib3_1.16.orig.tar.gz
+8812930f0eae40fbcaca76abb955921e5a2e8aca
+179763
+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 38264bf,0000000..122a908
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,291 @@@
- From 8e3232792cac904df40bed08f36b5a2c66468612 Mon Sep 17 00:00:00 2001
++From 7a66629e44973c2e0de3ee0d902100a557455ee9 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 +-
+ 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 +-
+ test/with_dummyserver/test_chunked_transfer.py | 2 +-
+ test/with_dummyserver/test_connectionpool.py | 2 +-
+ 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/fields.py | 2 +-
+ urllib3/filepost.py | 4 ++--
+ 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(-)
+
+diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
+index 7598329..504b998 100644
+--- a/dummyserver/handlers.py
++++ b/dummyserver/handlers.py
+@@ -269,7 +269,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
+--- 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
+
+ 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_fields.py b/test/test_fields.py
+index 21b4481..b547aa8 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_retry.py b/test/test_retry.py
- index 421e508..8fcc287 100644
++index 1e87585..48bad37 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/test/with_dummyserver/test_chunked_transfer.py b/test/with_dummyserver/test_chunked_transfer.py
+index 1d58e23..abfc777 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
+--- a/test/with_dummyserver/test_connectionpool.py
++++ b/test/with_dummyserver/test_connectionpool.py
+@@ -31,7 +31,7 @@ from urllib3.exceptions import (
+ ProtocolError,
+ NewConnectionError,
+ )
+-from urllib3.packages.six import b, u
++from six import b, u
+ from urllib3.util.retry import Retry
+ 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
+--- a/test/with_dummyserver/test_https.py
++++ b/test/with_dummyserver/test_https.py
+@@ -36,7 +36,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
+--- a/urllib3/connection.py
++++ b/urllib3/connection.py
+@@ -6,7 +6,7 @@ import sys
+ import socket
+ from socket import error as SocketError, timeout as SocketTimeout
+ import warnings
+-from .packages import six
++import six
+
+ try: # Python 3
+ from http.client import HTTPConnection as _HTTPConnection
+diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
- index 3fcfb12..989f8ca 100644
++index ab634cb..652b297 100644
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
+@@ -31,7 +31,7 @@ from .exceptions import (
+ NewConnectionError,
+ )
+ from .packages.ssl_match_hostname import CertificateError
+-from .packages import six
++import six
+ from .connection import (
+ port_by_scheme,
+ DummyConnection,
+diff --git a/urllib3/contrib/appengine.py b/urllib3/contrib/appengine.py
- index f4289c0..5355244 100644
++index 1579476..22e76e0 100644
+--- a/urllib3/contrib/appengine.py
++++ b/urllib3/contrib/appengine.py
+@@ -12,7 +12,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/fields.py b/urllib3/fields.py
+index 8fa2a12..14e5604 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
+--- 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/response.py b/urllib3/response.py
- index ac1b2f1..a2b0cb3 100644
++index 5567903..10e14ec 100644
+--- a/urllib3/response.py
++++ b/urllib3/response.py
+@@ -9,8 +9,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/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
+--- 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 2d3aa20..867d616 100644
++index d379833..c2e5380 100644
+--- a/urllib3/util/retry.py
++++ b/urllib3/util/retry.py
+@@ -9,7 +9,7 @@ from ..exceptions import (
+ ReadTimeoutError,
+ ResponseError,
+ )
+-from ..packages import six
++import six
+
+
+ log = logging.getLogger(__name__)
diff --cc debian/patches/02_require-cert-verification.patch
index fa20f0d,0000000..35ad3fa
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 e2f0f9789b9e5992b33c7ede2f70c9b0f356a56a Mon Sep 17 00:00:00 2001
++From 560678e666eca5ae53603e19961083171e589675 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 989f8ca..e8e47f1 100644
++index 652b297..38e56ff 100644
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
- @@ -713,6 +713,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
++@@ -730,6 +730,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'
- @@ -722,8 +724,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
++@@ -739,8 +741,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 966dca3,0000000..ee37cb2
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,30 @@@
- From f7d1a13d72330cfad9077c62c93ae2407acc20bd Mon Sep 17 00:00:00 2001
++From 2671c5c6d63d596af6d5e814f755740c55da8813 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(-)
+
+diff --git a/setup.cfg b/setup.cfg
- index ec26776..a240096 100644
++index 972e02c..4fabdbe 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 --cc debian/patches/05_avoid-embedded-ssl-match-hostname.patch
index 968a820,0000000..63a2b84
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 21501b42c55182861ad7afe82d5267f442722e03 Mon Sep 17 00:00:00 2001
++From a01056b36ac83a9fcc63af98f71ab81852864163 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