Fix #978: `intersphinx_mapping` also allows a list as a parameter

2 files changed, 2 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index beab1c718..baf8a9bbc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ Features added
 * #3241: emit latex warning if buggy titlesec (ref #3210)
 * #3194: Refer the $MAKE environment variable to determine ``make`` command
 * Emit warning for nested numbered toctrees (refs: #3142)
+* #978: `intersphinx_mapping` also allows a list as a parameter
 
 Bugs fixed
 ----------
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index f0592e4c8..7513323ef 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -242,7 +242,7 @@ def load_mappings(app):
     cache = env.intersphinx_cache
     update = False
     for key, value in iteritems(app.config.intersphinx_mapping):
-        if isinstance(value, tuple):
+        if isinstance(value, (list, tuple)):
             # new format
             name, (uri, inv) = key, value
             if not isinstance(name, string_types):