IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

`sphinx.util.compat.docutils_version` is now deprecated

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-12-13 21:21:06 +09:00
parent 2df0bb8d03
commit 50b35bb491
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -6,6 +6,7 @@ Incompatible changes
* ``sphinx.util.compat.Directive`` class is now deprecated. Please use instead
``docutils.parsers.rsr.Directive``
* ``sphinx.util.compat.docutils_version`` is now deprecated
Features added
--------------

4
sphinx/__init__.py
View File

@ -99,8 +99,8 @@ def build_main(argv=sys.argv):
return 1
raise
from sphinx.util.compat import docutils_version
if docutils_version < (0, 10):
import sphinx.util.docutils
if sphinx.util.docutils.__version_info__ < (0, 10):
sys.stderr.write('Error: Sphinx requires at least Docutils 0.10 to '
'run.\n')
return 1

4
sphinx/writers/manpage.py
View File

@ -21,7 +21,7 @@ from docutils.writers.manpage import (
from sphinx import addnodes
from sphinx.deprecation import RemovedInSphinx16Warning
from sphinx.locale import admonitionlabels, _
from sphinx.util.compat import docutils_version
import sphinx.util.docutils
from sphinx.util.i18n import format_date
@ -105,7 +105,7 @@ class ManualPageTranslator(BaseTranslator):
self._docinfo['manual_group'] = builder.config.project
# In docutils < 0.11 self.append_header() was never called
if docutils_version < (0, 11):
if sphinx.util.docutils.__version_info__ < (0, 11):
self.body.append(MACRO_DEF)
# Overwrite admonition label translations with our own