kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'MakeDocsWorkWithDocutilsBefore0_11'

Browse Source 
fb107d8 Help: Fix Sphinx extension with docutils < 0.11
This commit is contained in:
Brad King 2013-12-23 10:21:05 -05:00 committed by CMake Topic Stage
commit e73d1ad003
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Utilities/Sphinx/cmake.py
View File

@ -14,7 +14,12 @@ import re
from docutils.parsers.rst import Directive, directives from docutils.parsers.rst import Directive, directives
from docutils.transforms import Transform 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 docutils import io, nodes
from sphinx.directives import ObjectDescription from sphinx.directives import ObjectDescription