[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2537-g84c6313

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  84c63138a7fde596bb6615ede12da37a10848380 (commit)
       via  d55671ad9d6f24b79eaecbb9abbce49ef556742e (commit)
      from  e57c8937d42f4e4f37935ea8d9b84e488684560f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84c63138a7fde596bb6615ede12da37a10848380
commit 84c63138a7fde596bb6615ede12da37a10848380
Merge: e57c893 d55671a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 24 09:09:07 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 24 09:09:07 2014 -0400

    Merge topic 'sphinx-python3' into next
    
    d55671ad Utilities/Sphinx: Fix cmake domain document removal with python3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d55671ad9d6f24b79eaecbb9abbce49ef556742e
commit d55671ad9d6f24b79eaecbb9abbce49ef556742e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 24 09:04:27 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 24 09:04:52 2014 -0400

    Utilities/Sphinx: Fix cmake domain document removal with python3
    
    In the domain clear_doc method, avoid removing entries from a dictionary
    while iterating over it.  Instead accumulate a set of entries to remove
    at the end.

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):

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Sphinx/cmake.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake