Browse Source

Merge topic 'MakeDocsWorkWithDocutilsBefore0_11'

fb107d8 Help: Fix Sphinx extension with docutils < 0.11
Brad King 12 years ago
parent
commit
e73d1ad003
1 changed files with 6 additions and 1 deletions
  1. 6 1
      Utilities/Sphinx/cmake.py

+ 6 - 1
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