Merge pull request #3218 from tk0miya/3205_requests_crashes_with_old_…

…pyopenssl #3205: sphinx.util.requests crashes with old pyOpenSSL (< 0.14)
sphinx-doc · Dec 11, 2016 · 048a35e · 048a35e
2 parents c337912 + 52811d6
commit 048a35e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -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)

diff --git a/sphinx/util/requests.py b/sphinx/util/requests.py
@@ -22,7 +22,8 @@
 # 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