Skip to content

Commit

Permalink
[3.12] Docs: Avoid a DeprecationWarning in pyspecific.py when runni…
Browse files Browse the repository at this point in the history
…ng with Sphinx >=6.1 (GH-105886) (#106010)

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>
  • Loading branch information
3 people committed Jun 23, 2023
1 parent c407ef0 commit 3cc5523
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions Doc/tools/extensions/pyspecific.py
Expand Up @@ -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'
Expand Down

0 comments on commit 3cc5523

Please sign in to comment.