diff --git a/CHANGES b/CHANGES index b2ef6db3a..74b638f3f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ 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. * #780: Fix Python 2.5 compatibility. diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py index ac229a669..7a1aeb401 100644 --- a/sphinx/ext/intersphinx.py +++ b/sphinx/ext/intersphinx.py @@ -42,7 +42,7 @@ handlers = [urllib2.ProxyHandler(), urllib2.HTTPRedirectHandler(), urllib2.HTTPHandler()] try: handlers.append(urllib2.HTTPSHandler) -except NameError: +except AttributeError: pass urllib2.install_opener(urllib2.build_opener(*handlers))