From 50b35bb4913410f97778212e863cbc75da5820c6 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Tue, 13 Dec 2016 21:21:06 +0900 Subject: [PATCH] ``sphinx.util.compat.docutils_version`` is now deprecated --- CHANGES | 1 + sphinx/__init__.py | 4 ++-- sphinx/writers/manpage.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 2267a465d..e6d72afbe 100644 --- a/CHANGES +++ b/CHANGES @@ -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 -------------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 405fc2ff2..fb47a88ae 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -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 diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py index 53cf29767..249256576 100644 --- a/sphinx/writers/manpage.py +++ b/sphinx/writers/manpage.py @@ -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