[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6349-g1c380af

[Alexander Neundorf]

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  1c380af0e991aebc60dcf496f9ff34c9783bcace (commit)
       via  de8da6f311fccc1e5d494f48b20079f7f287651d (commit)
       via  eb684157bef60fe5668d284dbc97ee3b0930810c (commit)
       via  de607ff52ee0a1e44fdee071f6367d95533b7cd4 (commit)
      from  aefbef778396c2a4d5127e68f69abc4b16f4b0bb (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=1c380af0e991aebc60dcf496f9ff34c9783bcace
commit 1c380af0e991aebc60dcf496f9ff34c9783bcace
Merge: aefbef7 de8da6f
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Dec 22 15:42:19 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Dec 22 15:42:19 2013 -0500

    Merge topic 'MakeDocsWorkWithDocutilsBefore0_11' into next
    
    de8da6f Documentation: make it work with older docutils
    eb68415 CMake Nightly Date Stamp
    de607ff CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de8da6f311fccc1e5d494f48b20079f7f287651d
commit de8da6f311fccc1e5d494f48b20079f7f287651d
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Dec 22 20:46:57 2013 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Dec 22 20:46:57 2013 +0100

    Documentation: make it work with older docutils
    
    In older versions of python docutils error_reporting
    was not in the utils subpackage, so try the older
    location if the new one failed.
    Or should we actually try to check the version number ?
    
    Alex

diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py
index 146e1f6..1955e42 100644
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@@ -14,7 +14,12 @@ import re
 
 from docutils.parsers.rst import Directive, directives
 from docutils.transforms import Transform
-from docutils.utils.error_reporting import SafeString, ErrorString
+try:
+    from docutils.utils.error_reporting import SafeString, ErrorString
+except ImportError:
+    # error_reporting was not in utils before version 0.11:
+    from docutils.error_reporting import SafeString, ErrorString
+
 from docutils import io, nodes
 
 from sphinx.directives import ObjectDescription

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Utilities/Sphinx/cmake.py |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake