Merge remote-tracking branch 'origin/master'

2016-12-23 11:46:46 +01:00 · 2016-12-23 11:46:46 +01:00 · 9afde5746e
commit 9afde5746e
parent bafe60c5e2 9b5547eae0
1 changed files with 4 additions and 1 deletions
--- a/doc/_ext/configext.py
+++ b/doc/_ext/configext.py
@ -165,9 +165,12 @@ class ConfigFileDomain(Domain):
    }

    def clear_doc(self, docname):
+        toremove = []
        for key, (fn, _) in self.data['objects'].items():
            if fn == docname:
-                del self.data['objects'][key]
+                toremove.append(key)
+        for key in toremove:
+            del self.data['objects'][key]

    def resolve_xref(self, env, fromdocname, builder,
                     typ, target, node, contnode):