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

Fix #3614: Sphinx crashes with requests-2.5.0

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-04-08 13:41:06 +09:00
parent a9256bfa70
commit b6e4cceb8f
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -13,6 +13,8 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
* #3614: Sphinx crashes with requests-2.5.0
Testing Testing
-------- --------

14
sphinx/util/requests.py
View File

@ -36,6 +36,16 @@ except ImportError:
# for requests < 2.4.0 # for requests < 2.4.0
InsecureRequestWarning = None InsecureRequestWarning = None
try:
from requests.packages.urllib3.exceptions import InsecurePlatformWarning
except ImportError:
try:
# for Debian-jessie
from urllib3.exceptions import InsecurePlatformWarning
except ImportError:
# for requests < 2.4.0
InsecurePlatformWarning = None
# try to load requests[security] (but only if SSL is available) # try to load requests[security] (but only if SSL is available)
try: try:
import ssl import ssl
@ -48,8 +58,8 @@ else:
pkg_resources.VersionConflict): pkg_resources.VersionConflict):
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
requests.packages.urllib3.disable_warnings( if InsecurePlatformWarning:
requests.packages.urllib3.exceptions.InsecurePlatformWarning) requests.packages.urllib3.disable_warnings(InsecurePlatformWarning)
warnings.warn( warnings.warn(
'Some links may return broken results due to being unable to ' 'Some links may return broken results due to being unable to '
'check the Server Name Indication (SNI) in the returned SSL cert ' 'check the Server Name Indication (SNI) in the returned SSL cert '