Takayuki Shimizukawa avatar Takayuki Shimizukawa committed 7685daf

fix #1008 #1029 : intersphinx_mapping values are not stable if mapping have plural key/value set

Comments (0)

Files changed (1)

sphinx/ext/intersphinx.py

         for name, _, invdata in cache.itervalues():
             if name:
                 env.intersphinx_named_inventory[name] = invdata
-            for type, objects in invdata.iteritems():
-                env.intersphinx_inventory.setdefault(
-                    type, {}).update(objects)
+            else:
+                for type, objects in invdata.iteritems():
+                    env.intersphinx_inventory.setdefault(
+                        type, {}).update(objects)
 
 
 def missing_reference(app, env, node, contnode):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.