Skip to content

Commit 31f11e0

Browse files
committed
Fix imports for Sphinx above 6.1
1 parent 2981e43 commit 31f11e0

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

sphinxcontrib/htmlhelp/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,25 @@
1616
from docutils import nodes
1717
from docutils.nodes import Element, Node, document
1818

19+
import sphinx
1920
from sphinx import addnodes
2021
from sphinx.application import Sphinx
2122
from sphinx.builders.html import StandaloneHTMLBuilder
2223
from sphinx.config import Config
2324
from sphinx.environment.adapters.indexentries import IndexEntries
2425
from sphinx.locale import get_translation
2526
from sphinx.util import logging
26-
from sphinx.util import progress_message
2727
from sphinx.util.fileutil import copy_asset_file
2828
from sphinx.util.nodes import NodeMatcher
2929
from sphinx.util.osutil import make_filename_from_project, relpath
3030
from sphinx.util.template import SphinxRenderer
3131
from sphinx.writers.html import HTMLTranslator
3232

33+
if sphinx.version_info[:2] >= (6, 1):
34+
from sphinx.util.display import progress_message
35+
else:
36+
from sphinx.util import progress_message # type: ignore[attr-defined,no-redef]
37+
3338
__version__ = '2.0.1'
3439
__version_info__ = (2, 0, 1)
3540

0 commit comments

Comments
 (0)