diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2022-05-05 13:46:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 13:46:58 +0300 |
| commit | 21fb2caad662f83610f3889864acebe45fe3fef4 (patch) | |
| tree | cb64bfd5f9333de3d5e1f71b75a9653c4daa8757 | |
| parent | 335bf513e85eb2727322a2be9a731af427584fe0 (diff) | |
| parent | be212d98df9307217fed2f924382571b8f36e5f8 (diff) | |
Merge pull request #10412 from tk0miya/deprecate_sphinx.util.docutils.__version_info__
Remove sphinx.util.docutils.__version_info__ on 7.0
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | doc/extdev/deprecated.rst | 5 | ||||
| -rw-r--r-- | sphinx/util/docutils.py | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -54,6 +54,7 @@ Deprecated * The ``language`` argument of ``sphinx.util.i18n:format_date()`` becomes required * ``sphinx.builders.html.html5_ready`` +* ``sphinx.util.docutils.__version_info__`` * ``sphinx.util.docutils.is_html5_writer_available()`` * ``sphinx.writers.latex.LaTeXWriter.docclasses`` diff --git a/doc/extdev/deprecated.rst b/doc/extdev/deprecated.rst index 0f2d11fa2..5a03f821a 100644 --- a/doc/extdev/deprecated.rst +++ b/doc/extdev/deprecated.rst @@ -47,6 +47,11 @@ The following is a list of deprecated interfaces. - 7.0 - N/A + * - ``sphinx.util.docutils.__version_info__`` + - 5.0 + - 7.0 + - ``docutils.__version_info__`` + * - ``sphinx.util.docutils.is_html5_writer_available()`` - 5.0 - 7.0 diff --git a/sphinx/util/docutils.py b/sphinx/util/docutils.py index 6c4aa7312..e1fd78096 100644 --- a/sphinx/util/docutils.py +++ b/sphinx/util/docutils.py @@ -19,8 +19,7 @@ from docutils.parsers.rst.states import Inliner from docutils.statemachine import State, StateMachine, StringList from docutils.utils import Reporter, unescape -from sphinx.deprecation import (RemovedInSphinx60Warning, RemovedInSphinx70Warning, - deprecated_alias) +from sphinx.deprecation import RemovedInSphinx70Warning, deprecated_alias from sphinx.errors import SphinxError from sphinx.locale import _, __ from sphinx.util import logging @@ -38,7 +37,7 @@ deprecated_alias('sphinx.util.docutils', { '__version_info__': docutils.__version_info__, }, - RemovedInSphinx60Warning, + RemovedInSphinx70Warning, { '__version_info__': 'docutils.__version_info__', }) |