diff options
Diffstat (limited to 'debian/patches/05_avoid-embedded-ssl-match-hostname.patch')
| -rw-r--r-- | debian/patches/05_avoid-embedded-ssl-match-hostname.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/debian/patches/05_avoid-embedded-ssl-match-hostname.patch b/debian/patches/05_avoid-embedded-ssl-match-hostname.patch index 04894d4..1da4d26 100644 --- a/debian/patches/05_avoid-embedded-ssl-match-hostname.patch +++ b/debian/patches/05_avoid-embedded-ssl-match-hostname.patch @@ -1,4 +1,4 @@ -From 842fd4e9f188f13313124e3750f1c768d319fc34 Mon Sep 17 00:00:00 2001 +From 24ae6ba32069ca15f4a163e386964a3accdccf63 Mon Sep 17 00:00:00 2001 From: Stefano Rivera <stefanor@debian.org> Date: Thu, 8 Oct 2015 13:19:51 -0700 Subject: Do not use embedded copy of ssl.match_hostname, when possible @@ -11,18 +11,17 @@ Last-Update: 2014-11-18 Patch-Name: 05_avoid-embedded-ssl-match-hostname.patch --- - urllib3/packages/__init__.py | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + urllib3/packages/__init__.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/urllib3/packages/__init__.py b/urllib3/packages/__init__.py -index 37e8351..10a3aa8 100644 +index 170e974..35555ed 100644 --- a/urllib3/packages/__init__.py +++ b/urllib3/packages/__init__.py -@@ -1,4 +1,9 @@ +@@ -1,5 +1,11 @@ from __future__ import absolute_import -from . import ssl_match_hostname -- +try: + # cPython >= 2.7.9 has ssl features backported from Python3 + from ssl import CertificateError @@ -30,3 +29,5 @@ index 37e8351..10a3aa8 100644 + import ssl as ssl_match_hostname +except ImportError: + from . import ssl_match_hostname + + __all__ = ('ssl_match_hostname', ) |