Skip to content

Commit a72683b

Browse files
AlexWaygoodhugovk
andauthored
Docs: Avoid a DeprecationWarning in pyspecific.py when running with Sphinx >=6.1 (#105886)
Co-authored-by: Hugo van Kemenade <[email protected]>
1 parent 6a80664 commit a72683b

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

Doc/tools/extensions/pyspecific.py

+9-11
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,27 @@
1414
from os import getenv, path
1515
from time import asctime
1616
from pprint import pformat
17+
18+
from docutils import nodes, utils
1719
from docutils.io import StringOutput
1820
from docutils.parsers.rst import Directive
1921
from docutils.utils import new_document
20-
21-
from docutils import nodes, utils
22-
2322
from sphinx import addnodes
2423
from sphinx.builders import Builder
25-
try:
26-
from sphinx.errors import NoUri
27-
except ImportError:
28-
from sphinx.environment import NoUri
24+
from sphinx.domains.python import PyFunction, PyMethod
25+
from sphinx.errors import NoUri
2926
from sphinx.locale import _ as sphinx_gettext
30-
from sphinx.util import status_iterator, logging
27+
from sphinx.util import logging
3128
from sphinx.util.docutils import SphinxDirective
3229
from sphinx.util.nodes import split_explicit_title
3330
from sphinx.writers.text import TextWriter, TextTranslator
3431

3532
try:
36-
from sphinx.domains.python import PyFunction, PyMethod
33+
# Sphinx 6+
34+
from sphinx.util.display import status_iterator
3735
except ImportError:
38-
from sphinx.domains.python import PyClassmember as PyMethod
39-
from sphinx.domains.python import PyModulelevel as PyFunction
36+
# Deprecated in Sphinx 6.1, will be removed in Sphinx 8
37+
from sphinx.util import status_iterator
4038

4139

4240
ISSUE_URI = 'https://bugs.python.org/issue?@action=redirect&bpo=%s'

0 commit comments

Comments
 (0)