IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3218 from tk0miya/3205_requests_crashes_with_old_pyopenssl

Browse Source 
#3205: sphinx.util.requests crashes with old pyOpenSSL (< 0.14)
This commit is contained in:
Takeshi KOMIYA 2016-12-11 21:50:26 +09:00 committed by GitHub
commit 048a35ee54
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -17,6 +17,7 @@ Bugs fixed
* #3212: HTML Builders crashes with docutils-0.13
* #3207: more latex problems with references inside parsed-literal directive
(``\DUrole``)
* #3205: sphinx.util.requests crashes with old pyOpenSSL (< 0.14)
Release 1.5 (released Dec 5, 2016)

3
sphinx/util/requests.py
View File

@ -22,7 +22,8 @@ from requests.packages.urllib3.exceptions import SSLError, InsecureRequestWarnin
# try to load requests[security]
try:
pkg_resources.require(['requests[security]'])
except pkg_resources.DistributionNotFound:
except (pkg_resources.DistributionNotFound,
pkg_resources.VersionConflict):
import ssl
if not getattr(ssl, 'HAS_SNI', False):
# don't complain on each url processed about the SSL issue