diff options
| author | Stefano Rivera <stefanor@debian.org> | 2015-10-08 13:19:51 -0700 |
|---|---|---|
| committer | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:19:51 -0700 |
| commit | 7b1a10be6a3f7b3d3765abce6da5e37bace9a80d (patch) | |
| tree | 297308e76072c2f2e008b940bb5f118d52b1457e | |
| parent | 4c635f6a22f63cb8ae21916bda23ce7987953630 (diff) | |
| download | python-urllib3-7b1a10be6a3f7b3d3765abce6da5e37bace9a80d.tar python-urllib3-7b1a10be6a3f7b3d3765abce6da5e37bace9a80d.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__.py | 9 |
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 |