aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch')
-rw-r--r--debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch20
1 files changed, 10 insertions, 10 deletions
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=[],