[Python-modules-commits] r29056 - in packages/python-urllib3/trunk/debian (3 files)

[eriol-guest at users.alioth.debian.org]

    Date: Saturday, May 24, 2014 @ 22:26:42
  Author: eriol-guest
Revision: 29056

Do not use embedded copy of ssl.match_hostname

Added:
  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/patches/series

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2014-05-24 20:27:12 UTC (rev 29055)
+++ packages/python-urllib3/trunk/debian/changelog	2014-05-24 22:26:42 UTC (rev 29056)
@@ -10,8 +10,10 @@
   * debian/patches/03_force-setuptools.patch
     - Renamed from setuptools.patch
     - Added description
+  * debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch
+    - Do not use embedded copy of ssl.match_hostname
 
- -- Daniele Tricoli <eriol at mornie.org>  Sat, 24 May 2014 20:18:12 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Sun, 25 May 2014 00:22:12 +0200
 
 python-urllib3 (1.8-2) unstable; urgency=medium
 

Added: 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	                        (rev 0)
+++ packages/python-urllib3/trunk/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch	2014-05-24 22:26:42 UTC (rev 29056)
@@ -0,0 +1,45 @@
+Description: Do not use embedded copy of ssl.match_hostname.
+Author: Daniele Tricoli <eriol at mornie.org>
+Forwarded: not-needed
+Last-Update: 2014-05-25
+
+--- a/test/test_connectionpool.py
++++ b/test/test_connectionpool.py
+@@ -6,7 +6,7 @@
+     HTTPConnectionPool,
+ )
+ from urllib3.util import Timeout
+-from urllib3.packages.ssl_match_hostname import CertificateError
++from ssl import CertificateError
+ from urllib3.exceptions import (
+     ClosedPoolError,
+     EmptyPoolError,
+--- a/urllib3/connection.py
++++ b/urllib3/connection.py
+@@ -38,7 +38,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,
+--- a/urllib3/connectionpool.py
++++ b/urllib3/connectionpool.py
+@@ -31,7 +31,7 @@
+     ReadTimeoutError,
+     ProxyError,
+ )
+-from .packages.ssl_match_hostname import CertificateError
++from ssl import CertificateError
+ import six
+ from .connection import (
+     port_by_scheme,
+--- a/urllib3/packages/__init__.py
++++ b/urllib3/packages/__init__.py
+@@ -1,4 +1,3 @@
+ from __future__ import absolute_import
+ 
+-from . import ssl_match_hostname
+ 

Modified: packages/python-urllib3/trunk/debian/patches/series
===================================================================
--- packages/python-urllib3/trunk/debian/patches/series	2014-05-24 20:27:12 UTC (rev 29055)
+++ packages/python-urllib3/trunk/debian/patches/series	2014-05-24 22:26:42 UTC (rev 29056)
@@ -2,3 +2,4 @@
 02_require-cert-verification.patch
 03_force_setuptools.patch
 04_relax_nosetests_options.patch
+05_do-not-use-embedded-ssl-match-hostname.patch