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

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

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-01-08 14:35:44 +09:00
parent 57dd53d903
commit 175c6e66a6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -12,6 +12,7 @@ Features added
* #3241: emit latex warning if buggy titlesec (ref #3210) * #3241: emit latex warning if buggy titlesec (ref #3210)
* #3194: Refer the $MAKE environment variable to determine ``make`` command * #3194: Refer the $MAKE environment variable to determine ``make`` command
* Emit warning for nested numbered toctrees (refs: #3142) * Emit warning for nested numbered toctrees (refs: #3142)
* #978: `intersphinx_mapping` also allows a list as a parameter
Bugs fixed Bugs fixed
---------- ----------

2
sphinx/ext/intersphinx.py
View File

@ -242,7 +242,7 @@ def load_mappings(app):
cache = env.intersphinx_cache cache = env.intersphinx_cache
update = False update = False
for key, value in iteritems(app.config.intersphinx_mapping): for key, value in iteritems(app.config.intersphinx_mapping):
if isinstance(value, tuple): if isinstance(value, (list, tuple)):
# new format # new format
name, (uri, inv) = key, value name, (uri, inv) = key, value
if not isinstance(name, string_types): if not isinstance(name, string_types):