aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Rivera <stefanor@debian.org>2015-10-08 13:19:51 -0700
committerDaniele Tricoli <eriol@mornie.org>2015-10-09 23:17:44 +0200
commit797a60975f0ff4dcf615fca6f8b51ce62e5e91a6 (patch)
tree098318bb08c6caa253f191574d7a0c78470390b9
parent966d73488bc803f437395d8337bd322a0016084f (diff)
downloadpython-urllib3-797a60975f0ff4dcf615fca6f8b51ce62e5e91a6.tar
python-urllib3-797a60975f0ff4dcf615fca6f8b51ce62e5e91a6.tar.gz
Do not use embedded copy of ssl.match_hostname, when possible
The system python has the necessary features backported, since 2.7.8-7 (and 221a1f9155e2, releasing in 2.7.9, upstream). However, alternative python implementations don't, yet, and urllib3 is used by pip in virtualenvs. Forwarded: not-needed Last-Update: 2014-11-18 Patch-Name: 05_avoid-embedded-ssl-match-hostname.patch
-rw-r--r--urllib3/packages/__init__.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/urllib3/packages/__init__.py b/urllib3/packages/__init__.py
index 37e8351..10a3aa8 100644
--- a/urllib3/packages/__init__.py
+++ b/urllib3/packages/__init__.py
@@ -1,4 +1,9 @@
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
+ del CertificateError
+ import ssl as ssl_match_hostname
+except ImportError:
+ from . import ssl_match_hostname