Skip to content

Commit

Permalink
drop legacy progress-msg/status-iterator calls
Browse files Browse the repository at this point in the history
Since we enforce a minimum Sphinx v6.1, there is no longer a need to
maintain a compatibility calls to `process_message` and
`status_iterator`; dropping.

Signed-off-by: James Knight <james.d.knight@live.com>
  • Loading branch information
jdknight committed Feb 27, 2024
1 parent c444bb3 commit c588cfb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion sphinxcontrib/confluencebuilder/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
from sphinx import addnodes
from sphinx.builders import Builder
from sphinx.locale import _ as SL
from sphinx.util.display import status_iterator
from sphinxcontrib.confluencebuilder.assets import ConfluenceAssetManager
from sphinxcontrib.confluencebuilder.assets import ConfluenceSupportedImages
from sphinxcontrib.confluencebuilder.compat import docutils_findall as findall
from sphinxcontrib.confluencebuilder.compat import status_iterator
from sphinxcontrib.confluencebuilder.config import process_ask_configs
from sphinxcontrib.confluencebuilder.config.checks import validate_configuration
from sphinxcontrib.confluencebuilder.config.defaults import apply_defaults
Expand Down
9 changes: 0 additions & 9 deletions sphinxcontrib/confluencebuilder/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@
from sphinxcontrib.confluencebuilder.logger import ConfluenceLogger as logger
from typing import cast

# pylint: disable=no-name-in-module
if sphinx_version_info >= (6, 1):
from sphinx.util.display import status_iterator # noqa: F401
from sphinx.util.display import progress_message # noqa: F401
else:
from sphinx.util import status_iterator # noqa: F401
from sphinx.util import progress_message # noqa: F401
# pylint: enable=no-name-in-module


# use docutil's findall call over traverse (obsolete)
def docutils_findall(doctree, *args, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion sphinxcontrib/confluencebuilder/singlebuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

from docutils import nodes
from sphinx.util.console import darkgreen # pylint: disable=no-name-in-module
from sphinx.util.display import progress_message
from sphinxcontrib.confluencebuilder.builder import ConfluenceBuilder
from sphinxcontrib.confluencebuilder.compat import docutils_findall as findall
from sphinxcontrib.confluencebuilder.compat import inline_all_toctrees
from sphinxcontrib.confluencebuilder.compat import progress_message
from sphinxcontrib.confluencebuilder.locale import C
from sphinxcontrib.confluencebuilder.logger import ConfluenceLogger as logger

Expand Down

0 comments on commit c588cfb

Please sign in to comment.