IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2026-09-03 20:52:55 -05: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
parent c337912106 52811d6e09
commit 048a35ee54
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -17,6 +17,7 @@ Bugs fixed
* #3212: HTML Builders crashes with docutils-0.13 * #3212: HTML Builders crashes with docutils-0.13
* #3207: more latex problems with references inside parsed-literal directive * #3207: more latex problems with references inside parsed-literal directive
(``\DUrole``) (``\DUrole``)
* #3205: sphinx.util.requests crashes with old pyOpenSSL (< 0.14)
Release 1.5 (released Dec 5, 2016) Release 1.5 (released Dec 5, 2016)
sphinx/util/requests.py
+2 -1
View File
@@ -22,7 +22,8 @@ from requests.packages.urllib3.exceptions import SSLError, InsecureRequestWarnin
# try to load requests[security] # try to load requests[security]
try: try:
pkg_resources.require(['requests[security]']) pkg_resources.require(['requests[security]'])
except pkg_resources.DistributionNotFound: except (pkg_resources.DistributionNotFound,
pkg_resources.VersionConflict):
import ssl import ssl
if not getattr(ssl, 'HAS_SNI', False): if not getattr(ssl, 'HAS_SNI', False):
# don't complain on each url processed about the SSL issue # don't complain on each url processed about the SSL issue