aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2014-09-22 22:56:51 +0000
committerDaniele Tricoli <eriol@mornie.org>2014-09-22 22:56:51 +0000
commite670ed4b3fff99c53a62cfac518f35187f1c4f38 (patch)
tree8bb714711d662f10d729d21c1ab13decaa290c10 /debian
parent3419e57bfd45d703aa41f782fee9546499bf2cb8 (diff)
downloadpython-urllib3-e670ed4b3fff99c53a62cfac518f35187f1c4f38.tar
python-urllib3-e670ed4b3fff99c53a62cfac518f35187f1c4f38.tar.gz
Refresh debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch8
2 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 9b1038c..a905344 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ python-urllib3 (1.9.1-1) UNRELEASED; urgency=medium
* New upstream release.
* debian/patches/01_do-not-use-embedded-python-six.patch
- Refresh.
+ * debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
+ - Refresh.
+
- -- Daniele Tricoli <eriol@mornie.org> Tue, 23 Sep 2014 00:39:43 +0200
+ -- Daniele Tricoli <eriol@mornie.org> Tue, 23 Sep 2014 00:54:44 +0200
python-urllib3 (1.9-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 17c858d..b58f31d 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,7 +1,7 @@
Description: Do not use embedded copy of ssl.match_hostname.
Author: Daniele Tricoli <eriol@mornie.org>
Forwarded: not-needed
-Last-Update: 2014-09-01
+Last-Update: 2014-09-23
--- a/test/test_connectionpool.py
+++ b/test/test_connectionpool.py
@@ -16,15 +16,15 @@ Last-Update: 2014-09-01
EmptyPoolError,
--- a/urllib3/connection.py
+++ b/urllib3/connection.py
-@@ -27,7 +27,7 @@
- from .exceptions import (
+@@ -39,7 +39,7 @@
ConnectTimeoutError,
+ SystemTimeWarning,
)
-from .packages.ssl_match_hostname import match_hostname
+from ssl import match_hostname
- import six
from .util.ssl_ import (
+ resolve_cert_reqs,
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
@@ -26,7 +26,7 @@