[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2479-g8b512de

[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  8b512deb9c3818002cad17dc29db211e22fcfa99 (commit)
       via  69069cfb1ab39d3466bedce65f02aa186f4d65fd (commit)
      from  f84ac3b2e89cf31590f8dc1daf861ff053e5035c (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=8b512deb9c3818002cad17dc29db211e22fcfa99
commit 8b512deb9c3818002cad17dc29db211e22fcfa99
Merge: f84ac3b 69069cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 18 08:57:11 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 18 08:57:11 2014 -0400

    Merge topic 'sphinx-python3' into next
    
    69069cfb Utilities/Sphinx: Port documentation generation to python3 (#14886)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69069cfb1ab39d3466bedce65f02aa186f4d65fd
commit 69069cfb1ab39d3466bedce65f02aa186f4d65fd
Author:     Uwe L. Korn <uwelk at xhochy.com>
AuthorDate: Fri Apr 18 10:19:18 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 18 08:42:34 2014 -0400

    Utilities/Sphinx: Port documentation generation to python3 (#14886)

diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py
index 336c74a..5eb4eac 100644
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@@ -62,12 +62,12 @@ class CMakeModule(Directive):
             settings.record_dependencies.add(path)
             f = io.FileInput(source_path=path, encoding=encoding,
                              error_handler=e_handler)
-        except UnicodeEncodeError, error:
+        except UnicodeEncodeError as error:
             raise self.severe('Problems with "%s" directive path:\n'
                               'Cannot encode input file path "%s" '
                               '(wrong locale?).' %
                               (self.name, SafeString(path)))
-        except IOError, error:
+        except IOError as error:
             raise self.severe('Problems with "%s" directive path:\n%s.' %
                       (self.name, ErrorString(error)))
         raw_lines = f.read().splitlines()
@@ -305,7 +305,7 @@ class CMakeDomain(Domain):
                             contnode, target)
 
     def get_objects(self):
-        for refname, (docname, type) in self.data['objects'].iteritems():
+        for refname, (docname, type) in self.data['objects'].items():
             yield (refname, refname, type, docname, refname, 1)
 
 def setup(app):
diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index ef622fd..e334389 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -50,7 +50,7 @@ for fpath in cmake_manuals:
                               name, desc, [], int(sec)))
         else:
             sys.stderr.write("ERROR: No cmake-manual-description in '%s'\n" % fpath)
-    except Exception, e:
+    except Exception as e:
         sys.stderr.write("ERROR: %s\n" % str(e))
 man_show_urls = False
 

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

Summary of changes:
 Utilities/Sphinx/cmake.py   |    6 +++---
 Utilities/Sphinx/conf.py.in |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake