Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 581d262

Browse filesBrowse files
miss-islingtonAlexWaygoodhugovk
authored
[3.11] Docs: Avoid a DeprecationWarning in pyspecific.py when running with Sphinx >=6.1 (GH-105886) (#106011)
Docs: Avoid a DeprecationWarning in `pyspecific.py` when running with Sphinx >=6.1 (GH-105886) (cherry picked from commit a72683b) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
1 parent 6d232ba commit 581d262
Copy full SHA for 581d262

File tree

1 file changed

+9
-11
lines changed
Filter options

1 file changed

+9
-11
lines changed

‎Doc/tools/extensions/pyspecific.py

Copy file name to clipboardExpand all lines: Doc/tools/extensions/pyspecific.py
+9-11Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,28 @@
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
from sphinx.writers.latex import LaTeXTranslator
3532

3633
try:
37-
from sphinx.domains.python import PyFunction, PyMethod
34+
# Sphinx 6+
35+
from sphinx.util.display import status_iterator
3836
except ImportError:
39-
from sphinx.domains.python import PyClassmember as PyMethod
40-
from sphinx.domains.python import PyModulelevel as PyFunction
37+
# Deprecated in Sphinx 6.1, will be removed in Sphinx 8
38+
from sphinx.util import status_iterator
4139

4240
# Support for checking for suspicious markup
4341

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.