浏览代码

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
Alex Neundorf 12 年之前
父节点
当前提交
fb107d84d2
共有 1 个文件被更改,包括 6 次插入1 次删除
  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