From cf1435afb513148bbf368cacfe33fdeba42a4dd5 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 31 Mar 2009 14:01:26 -0500
Subject: [PATCH] Fix intersphinx for installations without
 urllib2.HTTPSHandler.

---
 CHANGES                   | 2 ++
 sphinx/ext/intersphinx.py | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index a2eeb6818..189fd3fe8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 0.6.2 (in development)
 ==============================
 
+* Fix intersphinx for installations without urllib2.HTTPSHandler.
+
 * #134: Fix pending_xref leftover nodes when using the todolist
   directive from the todo extension.
 
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index 4401915eb..3c97a7342 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -33,10 +33,12 @@ from docutils import nodes
 
 from sphinx.builders.html import INVENTORY_FILENAME
 
+handlers = [urllib2.ProxyHandler(), urllib2.HTTPRedirectHandler(),
+            urllib2.HTTPHandler()]
+if hasattr(urllib2, 'HTTPSHandler'):
+    handlers.append(urllib2.HTTPSHandler)
 
-urllib2.install_opener(urllib2.build_opener(
-    urllib2.ProxyHandler(), urllib2.HTTPRedirectHandler(),
-    urllib2.HTTPHandler(), urllib2.HTTPSHandler()))
+urllib2.install_opener(urllib2.build_opener(*handlers))
 
 
 def fetch_inventory(app, uri, inv):