Merge branch 'sphinx-python3' into release

2014-04-24 09:26:41 -04:00 · 2014-04-24 09:26:41 -04:00 · 20b46a09e3
parent 72ab764582 d55671ad9d
commit 20b46a09e3
1 changed files with 4 additions and 1 deletions
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@ -290,8 +290,11 @@ class CMakeDomain(Domain):
    }

    def clear_doc(self, docname):
+        to_clear = set()
        for fullname, (fn, _) in self.data['objects'].items():
            if fn == docname:
+                to_clear.add(fullname)
+        for fullname in to_clear:
            del self.data['objects'][fullname]

    def resolve_xref(self, env, fromdocname, builder,