From cfc0233369906e9287e631d7fc2319a66f3eb09a Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Fri, 21 Apr 2023 13:29:02 +0300 Subject: [PATCH] ipasphinx: Correct import of progress_message for Sphinx 6.1.0+ Pylint reports false-negative result for Sphinx 6.1.0+: ``` ************* Module ipasphinx.ipabase ipasphinx/ipabase.py:10: [E0611(no-name-in-module), ] No name 'progress_message' in module 'sphinx.util') ``` Actually `sphinx.util.progress_message` is still available in Sphinx 6.1 but it's deprecated and will be removed in 8.0: https://www.sphinx-doc.org/en/master/extdev/deprecated.html#deprecated-apis Related change: https://github.com/sphinx-doc/sphinx/commit/8c5e7013ea5f6a50e3cc3130b22205a85ba87fab Fixes: https://pagure.io/freeipa/issue/9361 Signed-off-by: Stanislav Levin Reviewed-By: Rob Crittenden --- ipasphinx/ipabase.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ipasphinx/ipabase.py b/ipasphinx/ipabase.py index 5a0824c96..6842f6a13 100644 --- a/ipasphinx/ipabase.py +++ b/ipasphinx/ipabase.py @@ -7,7 +7,11 @@ import os import re import sys -from sphinx.util import progress_message +try: + from sphinx.util.display import progress_message +except ImportError: + # sphinx < 6.1.0 + from sphinx.util import progress_message from sphinx.ext.autodoc import mock as autodoc_mock HERE = os.path.dirname(os.path.abspath(__file__))