diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2014-08-31 23:02:07 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2014-08-31 23:02:07 +0000 |
| commit | 696eb71f386cc0c21cde533fd2572b69823bddad (patch) | |
| tree | 93e5f60ccc7763f8e291efa0a33315d0e3db62e0 /debian | |
| parent | 5074da0fb36b78402877d7626982a70aafe2e5dd (diff) | |
| download | python-urllib3-696eb71f386cc0c21cde533fd2572b69823bddad.tar python-urllib3-696eb71f386cc0c21cde533fd2572b69823bddad.tar.gz | |
Refresh 05_do-not-use-embedded-ssl-match-hostname.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 792afaf..10eed10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ python-urllib3 (1.9-1) UNRELEASED; urgency=medium - Refresh * debian/patches/02_require-cert-verification.patch - Refresh + * debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch + - Refresh - -- Daniele Tricoli <eriol@mornie.org> Mon, 01 Sep 2014 00:48:18 +0200 + -- Daniele Tricoli <eriol@mornie.org> Mon, 01 Sep 2014 01:00:03 +0200 python-urllib3 (1.8.3-1) unstable; urgency=medium diff --git a/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch b/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch index 9ee4cb9..17c858d 100644 --- a/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch +++ b/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch @@ -1,14 +1,14 @@ Description: Do not use embedded copy of ssl.match_hostname. Author: Daniele Tricoli <eriol@mornie.org> Forwarded: not-needed -Last-Update: 2014-05-25 +Last-Update: 2014-09-01 --- a/test/test_connectionpool.py +++ b/test/test_connectionpool.py @@ -6,7 +6,7 @@ HTTPConnectionPool, ) - from urllib3.util import Timeout + from urllib3.util.timeout import Timeout -from urllib3.packages.ssl_match_hostname import CertificateError +from ssl import CertificateError from urllib3.exceptions import ( @@ -16,20 +16,20 @@ Last-Update: 2014-05-25 EmptyPoolError, --- a/urllib3/connection.py +++ b/urllib3/connection.py -@@ -38,7 +38,7 @@ +@@ -27,7 +27,7 @@ from .exceptions import ( ConnectTimeoutError, ) -from .packages.ssl_match_hostname import match_hostname +from ssl import match_hostname import six - from .util import ( - assert_fingerprint, + + from .util.ssl_ import ( --- a/urllib3/connectionpool.py +++ b/urllib3/connectionpool.py -@@ -31,7 +31,7 @@ - ReadTimeoutError, - ProxyError, +@@ -26,7 +26,7 @@ + TimeoutError, + InsecureRequestWarning, ) -from .packages.ssl_match_hostname import CertificateError +from ssl import CertificateError @@ -45,7 +45,7 @@ Last-Update: 2014-05-25 --- a/setup.py +++ b/setup.py -@@ -45,7 +45,7 @@ +@@ -42,7 +42,7 @@ url='http://urllib3.readthedocs.org/', license='MIT', packages=['urllib3', @@ -53,4 +53,4 @@ Last-Update: 2014-05-25 + 'urllib3.packages', 'urllib3.contrib', 'urllib3.util', ], - requires=requirements, + requires=[], |