[Python-modules-commits] r30722 - in packages/python-urllib3/trunk/debian (2 files)
eriol-guest at users.alioth.debian.org
eriol-guest at users.alioth.debian.org
Mon Sep 22 22:56:52 UTC 2014
Date: Monday, September 22, 2014 @ 22:56:51
Author: eriol-guest
Revision: 30722
Refresh debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
Modified:
packages/python-urllib3/trunk/debian/changelog
packages/python-urllib3/trunk/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog 2014-09-22 22:42:56 UTC (rev 30721)
+++ packages/python-urllib3/trunk/debian/changelog 2014-09-22 22:56:51 UTC (rev 30722)
@@ -3,9 +3,12 @@
* 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 at mornie.org> Tue, 23 Sep 2014 00:39:43 +0200
+ -- Daniele Tricoli <eriol at mornie.org> Tue, 23 Sep 2014 00:54:44 +0200
+
python-urllib3 (1.9-1) unstable; urgency=medium
* New upstream release
Modified: packages/python-urllib3/trunk/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch 2014-09-22 22:42:56 UTC (rev 30721)
+++ packages/python-urllib3/trunk/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch 2014-09-22 22:56:51 UTC (rev 30722)
@@ -1,7 +1,7 @@
Description: Do not use embedded copy of ssl.match_hostname.
Author: Daniele Tricoli <eriol at 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 @@
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 @@
More information about the Python-modules-commits
mailing list