[Python-modules-commits] [python-urllib3] 09/11: merge patched into master
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Sat Oct 10 01:03:37 UTC 2015
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 cd2a4010a9e1356c36cfb42b57501343c29e2608
Merge: ebc01af 7db0aa9
Author: Daniele Tricoli <eriol at mornie.org>
Date: Fri Oct 9 23:19:30 2015 +0200
merge patched into master
CHANGES.rst | 28 +-
PKG-INFO | 30 +-
debian/.git-dpm | 6 +-
.../01_do-not-use-embedded-python-six.patch | 28 +-
debian/patches/02_require-cert-verification.patch | 16 +-
debian/patches/03_force_setuptools.patch | 2 +-
debian/patches/04_relax_nosetests_options.patch | 2 +-
.../05_avoid-embedded-ssl-match-hostname.patch | 2 +-
...y-on-six-to-import-httplib-or-http.client.patch | 36 +--
dev-requirements.txt | 12 +-
dummyserver/certs/ca_path_test/98a2772e.0 | 23 ++
dummyserver/certs/ca_path_test/b6b9ccf9.0 | 23 ++
dummyserver/certs/ca_path_test/cacert.pem | 23 ++
dummyserver/handlers.py | 2 +
dummyserver/server.py | 1 +
dummyserver/testcase.py | 31 ++
test/__init__.py | 11 +
test/test_util.py | 10 +-
test/with_dummyserver/test_connectionpool.py | 325 +++++++++++----------
test/with_dummyserver/test_https.py | 26 +-
test/with_dummyserver/test_proxy_poolmanager.py | 4 +-
test/with_dummyserver/test_socketlevel.py | 36 +--
urllib3.egg-info/PKG-INFO | 30 +-
urllib3.egg-info/SOURCES.txt | 4 +
urllib3.egg-info/pbr.json | 1 +
urllib3/__init__.py | 2 +-
urllib3/connection.py | 19 +-
urllib3/connectionpool.py | 20 +-
urllib3/contrib/pyopenssl.py | 6 +-
urllib3/exceptions.py | 3 +
urllib3/util/connection.py | 8 +-
urllib3/util/ssl_.py | 23 +-
32 files changed, 485 insertions(+), 308 deletions(-)
diff --cc debian/.git-dpm
index f1fe0d3,0000000..297ce9a
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
- 6037bb76fda33e09811e44f56bf3dcc73daeebc4
- 6037bb76fda33e09811e44f56bf3dcc73daeebc4
- e6838673bda9af1e9bf7c4f71b25cf3e3dfc1253
++7db0aa9b18e70f43ef0bfcdec7f223e5b681aaf0
++7db0aa9b18e70f43ef0bfcdec7f223e5b681aaf0
++2b3d330a120a16e97cecd5163b5d454dcfe38a2b
+2b3d330a120a16e97cecd5163b5d454dcfe38a2b
+python-urllib3_1.12.orig.tar.gz
+1d8b23f0120bbe4bdb3b6993eebe5c958c35c553
+151072
+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 24710dd,0000000..363e772
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,221 -1,0 +1,223 @@@
- From e720aa3dea81bf5c30d9a897f9cbae18bf6a4228 Mon Sep 17 00:00:00 2001
++From 3a7deaa269ec9e1dc5dfb860e29b053475647cf5 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
+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/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
+- 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
++index f7c4a7a..22d3616 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
++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
+
+ 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
++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
++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/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/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__)
diff --cc debian/patches/02_require-cert-verification.patch
index 6973d7a,0000000..b10b3b1
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 9cd0feeb36e835dbc9f394befd32e02ec1ce6841 Mon Sep 17 00:00:00 2001
++From f27a60baa815150ce224d1be75464c46d987f749 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 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,
+- 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):
++ ca_cert_dir=None, **conn_kw):
+
diff --cc debian/patches/03_force_setuptools.patch
index eac0ab9,0000000..b1b3234
mode 100644,000000..100644
--- a/debian/patches/03_force_setuptools.patch
+++ b/debian/patches/03_force_setuptools.patch
@@@ -1,25 -1,0 +1,25 @@@
- From dc99fcbaf17c2d80172632cfcee0ed47762b9ccd Mon Sep 17 00:00:00 2001
++From a89ef67cc90bdfc8d4832cdd07baed149bdffd88 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at 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 @@
+ #!/usr/bin/env python
+
+-from distutils.core import setup
++from setuptools import setup
+
+ import os
+ import re
diff --cc debian/patches/04_relax_nosetests_options.patch
index 8f23e88,0000000..bec12aa
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 4c635f6a22f63cb8ae21916bda23ce7987953630 Mon Sep 17 00:00:00 2001
++From 966d73488bc803f437395d8337bd322a0016084f 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 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 --cc debian/patches/05_avoid-embedded-ssl-match-hostname.patch
index b440988,0000000..9bb55f6
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,32 -1,0 +1,32 @@@
- From 7b1a10be6a3f7b3d3765abce6da5e37bace9a80d Mon Sep 17 00:00:00 2001
++From 797a60975f0ff4dcf615fca6f8b51ce62e5e91a6 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 | 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 @@
+ 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 --cc debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch
index 5bea26b,0000000..435b6bb
mode 100644,000000..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,46 -1,0 +1,22 @@@
- 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 at 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(-)
++ 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
+
--
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