[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6358-gf771f19

[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  f771f194b7ccec747f028c340cef9cd804e32ade (commit)
       via  fb107d84d2c79cc985b6bc72113db3ddac1a6584 (commit)
      from  39805d402c54eb43810d550ee572684c6f6f4acd (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=f771f194b7ccec747f028c340cef9cd804e32ade
commit f771f194b7ccec747f028c340cef9cd804e32ade
Merge: 39805d4 fb107d8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 23 10:20:58 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 23 10:20:58 2013 -0500

    Merge topic 'MakeDocsWorkWithDocutilsBefore0_11' into next
    
    fb107d8 Help: Fix Sphinx extension with docutils < 0.11


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb107d84d2c79cc985b6bc72113db3ddac1a6584
commit fb107d84d2c79cc985b6bc72113db3ddac1a6584
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Dec 22 20:46:57 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 23 10:17:01 2013 -0500

    Help: Fix Sphinx extension with docutils < 0.11
    
    In older versions of python docutils "error_reporting" was not in the
    "utils" subpackage, so try the older location if the new one failed.
    
    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:


hooks/post-receive
-- 
CMake