|
14 | 14 | from os import getenv, path
|
15 | 15 | from time import asctime
|
16 | 16 | from pprint import pformat
|
| 17 | + |
| 18 | +from docutils import nodes, utils |
17 | 19 | from docutils.io import StringOutput
|
18 | 20 | from docutils.parsers.rst import Directive
|
19 | 21 | from docutils.utils import new_document
|
20 |
| - |
21 |
| -from docutils import nodes, utils |
22 |
| - |
23 | 22 | from sphinx import addnodes
|
24 | 23 | 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 |
29 | 26 | from sphinx.locale import _ as sphinx_gettext
|
30 |
| -from sphinx.util import status_iterator, logging |
| 27 | +from sphinx.util import logging |
31 | 28 | from sphinx.util.docutils import SphinxDirective
|
32 | 29 | from sphinx.util.nodes import split_explicit_title
|
33 | 30 | from sphinx.writers.text import TextWriter, TextTranslator
|
34 | 31 |
|
35 | 32 | try:
|
36 |
| - from sphinx.domains.python import PyFunction, PyMethod |
| 33 | + # Sphinx 6+ |
| 34 | + from sphinx.util.display import status_iterator |
37 | 35 | 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 |
40 | 38 |
|
41 | 39 |
|
42 | 40 | ISSUE_URI = 'https://bugs.python.org/issue?@action=redirect&bpo=%s'
|
|
0 commit comments