summaryrefslogtreecommitdiffstats
path: root/Utilities/Sphinx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-24 13:24:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-04-24 13:24:59 (GMT)
commit3c8226e590f252977e0ab79d7fe85b2fb9e7ef78 (patch)
treeba83cebf2fb643349644160d5199319c5fe6da9f /Utilities/Sphinx
parent9264983b82cf8fa28e7fe8858868261434d74954 (diff)
parentd55671ad9d6f24b79eaecbb9abbce49ef556742e (diff)
downloadCMake-3c8226e590f252977e0ab79d7fe85b2fb9e7ef78.zip
CMake-3c8226e590f252977e0ab79d7fe85b2fb9e7ef78.tar.gz
CMake-3c8226e590f252977e0ab79d7fe85b2fb9e7ef78.tar.bz2
Merge topic 'sphinx-python3'
d55671ad Utilities/Sphinx: Fix cmake domain document removal with python3
Diffstat (limited to 'Utilities/Sphinx')
-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 108c6ef..6e6e48a 100644
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@@ -308,9 +308,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):