summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-24 13:26:41 (GMT)
committerBrad King <brad.king@kitware.com>2014-04-24 13:26:41 (GMT)
commit20b46a09e38be7521a903e1846716ce9a2ed2df6 (patch)
treeb19030a39926a953aa6ffe65203985181c2e7605
parent72ab7645823777afb5a906ac08d1113ee24ac8bb (diff)
parentd55671ad9d6f24b79eaecbb9abbce49ef556742e (diff)
downloadCMake-20b46a09e38be7521a903e1846716ce9a2ed2df6.zip
CMake-20b46a09e38be7521a903e1846716ce9a2ed2df6.tar.gz
CMake-20b46a09e38be7521a903e1846716ce9a2ed2df6.tar.bz2
Merge branch 'sphinx-python3' into release
-rw-r--r--Utilities/Sphinx/cmake.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py
index 5eb4eac..0e8f280 100644
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@@ -290,9 +290,12 @@ class CMakeDomain(Domain):
}
def clear_doc(self, docname):
+ to_clear = set()
for fullname, (fn, _) in self.data['objects'].items():
if fn == docname:
- del self.data['objects'][fullname]
+ to_clear.add(fullname)
+ for fullname in to_clear:
+ del self.data['objects'][fullname]
def resolve_xref(self, env, fromdocname, builder,
typ, target, node, contnode):