[Python-checkins] Docs: Avoid a DeprecationWarning in `pyspecific.py` when running with Sphinx >=6.1 (#105886)
AlexWaygood
webhook-mailer at python.org
Fri Jun 23 03:58:49 EDT 2023
https://github.com/python/cpython/commit/a72683ba8e0337650cc490dbe593a5e46aba60cb
commit: a72683ba8e0337650cc490dbe593a5e46aba60cb
branch: main
author: Alex Waygood <Alex.Waygood at Gmail.com>
committer: AlexWaygood <Alex.Waygood at Gmail.com>
date: 2023-06-23T08:58:45+01:00
summary:
Docs: Avoid a DeprecationWarning in `pyspecific.py` when running with Sphinx >=6.1 (#105886)
Co-authored-by: Hugo van Kemenade <hugovk at users.noreply.github.com>
files:
M Doc/tools/extensions/pyspecific.py
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
index 8a2eb07a69a69..795aeed1007a7 100644
--- a/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
@@ -14,29 +14,27 @@
from os import getenv, path
from time import asctime
from pprint import pformat
+
+from docutils import nodes, utils
from docutils.io import StringOutput
from docutils.parsers.rst import Directive
from docutils.utils import new_document
-
-from docutils import nodes, utils
-
from sphinx import addnodes
from sphinx.builders import Builder
-try:
- from sphinx.errors import NoUri
-except ImportError:
- from sphinx.environment import NoUri
+from sphinx.domains.python import PyFunction, PyMethod
+from sphinx.errors import NoUri
from sphinx.locale import _ as sphinx_gettext
-from sphinx.util import status_iterator, logging
+from sphinx.util import logging
from sphinx.util.docutils import SphinxDirective
from sphinx.util.nodes import split_explicit_title
from sphinx.writers.text import TextWriter, TextTranslator
try:
- from sphinx.domains.python import PyFunction, PyMethod
+ # Sphinx 6+
+ from sphinx.util.display import status_iterator
except ImportError:
- from sphinx.domains.python import PyClassmember as PyMethod
- from sphinx.domains.python import PyModulelevel as PyFunction
+ # Deprecated in Sphinx 6.1, will be removed in Sphinx 8
+ from sphinx.util import status_iterator
ISSUE_URI = 'https://bugs.python.org/issue?@action=redirect&bpo=%s'
More information about the Python-checkins
mailing list