diff options
Diffstat (limited to 'sphinx/util/requests.py')
| -rw-r--r-- | sphinx/util/requests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/util/requests.py b/sphinx/util/requests.py index 3576b0088..d358d8435 100644 --- a/sphinx/util/requests.py +++ b/sphinx/util/requests.py @@ -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 |