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

Closes #801: Make intersphinx work properly without SSL support.

Browse Source
This commit is contained in:
Georg Brandl 2011-11-01 09:01:48 +01:00
parent ddb7fab16d
commit 5d19b860e2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
Release 1.1.1 (in development) Release 1.1.1 (in development)
============================== ==============================
* #801: Make intersphinx work properly without SSL support.
* #805: Make the ``Sphinx.add_index_to_domain`` method work correctly. * #805: Make the ``Sphinx.add_index_to_domain`` method work correctly.
* #780: Fix Python 2.5 compatibility. * #780: Fix Python 2.5 compatibility.

2
sphinx/ext/intersphinx.py
View File

@ -42,7 +42,7 @@ handlers = [urllib2.ProxyHandler(), urllib2.HTTPRedirectHandler(),
urllib2.HTTPHandler()] urllib2.HTTPHandler()]
try: try:
handlers.append(urllib2.HTTPSHandler) handlers.append(urllib2.HTTPSHandler)
except NameError: except AttributeError:
pass pass
urllib2.install_opener(urllib2.build_opener(*handlers)) urllib2.install_opener(urllib2.build_opener(*handlers))