From 078ba51a5851e388abe1357a552b981cba1acca9 Mon Sep 17 00:00:00 2001 From: Tomas Fratrik Date: Wed, 13 Aug 2025 13:43:04 +0200 Subject: [PATCH 36/55] pylint: enable logging-not-lazy Jira: RHELMISC-16038 --- .pylintrc | 1 - .../rpmtransactionconfigtaskscollector.py | 5 +++-- .../storagescanner/libraries/storagescanner.py | 8 ++++++-- .../common/libraries/persistentnetnames.py | 2 +- .../libraries/multipathconfread.py | 14 +++++++++----- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.pylintrc b/.pylintrc index 7d938715..f7f4b25d 100644 --- a/.pylintrc +++ b/.pylintrc @@ -53,7 +53,6 @@ disable= use-a-generator, # cannot be modified because of Python2 support consider-using-f-string, # sorry, not gonna happen, still have to support py2 logging-format-interpolation, - logging-not-lazy, use-yield-from # yield from cannot be used until we require python 3.3 or greater [FORMAT] diff --git a/repos/system_upgrade/common/actors/rpmtransactionconfigtaskscollector/libraries/rpmtransactionconfigtaskscollector.py b/repos/system_upgrade/common/actors/rpmtransactionconfigtaskscollector/libraries/rpmtransactionconfigtaskscollector.py index 43ac1fc4..84895f83 100644 --- a/repos/system_upgrade/common/actors/rpmtransactionconfigtaskscollector/libraries/rpmtransactionconfigtaskscollector.py +++ b/repos/system_upgrade/common/actors/rpmtransactionconfigtaskscollector/libraries/rpmtransactionconfigtaskscollector.py @@ -29,8 +29,9 @@ def load_tasks(base_dir, logger): filtered = set(to_install) - set(to_install_filtered) if filtered: api.current_logger().debug( - 'The following packages from "to_install" file will be ignored as they are already installed:' - '\n- ' + '\n- '.join(filtered)) + 'The following packages from "to_install" file will be ignored as they are already installed:\n- %s', + '\n- '.join(filtered) + ) return RpmTransactionTasks( to_install=to_install_filtered, diff --git a/repos/system_upgrade/common/actors/storagescanner/libraries/storagescanner.py b/repos/system_upgrade/common/actors/storagescanner/libraries/storagescanner.py index cae38731..e2d869da 100644 --- a/repos/system_upgrade/common/actors/storagescanner/libraries/storagescanner.py +++ b/repos/system_upgrade/common/actors/storagescanner/libraries/storagescanner.py @@ -35,7 +35,7 @@ def _is_file_readable(path): def _get_cmd_output(cmd, delim, expected_len): """ Verify if command exists and return output """ if not any(os.access(os.path.join(path, cmd[0]), os.X_OK) for path in os.environ['PATH'].split(os.pathsep)): - api.current_logger().warning("'%s': command not found" % cmd[0]) + api.current_logger().warning("'%s': command not found", cmd[0]) return try: @@ -45,7 +45,11 @@ def _get_cmd_output(cmd, delim, expected_len): output = subprocess.check_output(cmd, env={'LVM_SUPPRESS_FD_WARNINGS': '1', 'PATH': os.environ['PATH']}) except subprocess.CalledProcessError as e: - api.current_logger().debug("Command '%s' return non-zero exit status: %s" % (" ".join(cmd), e.returncode)) + api.current_logger().debug( + "Command '%s' returned non-zero exit status: %s", + " ".join(cmd), + e.returncode + ) return if bytes is not str: diff --git a/repos/system_upgrade/common/libraries/persistentnetnames.py b/repos/system_upgrade/common/libraries/persistentnetnames.py index 8769712c..7fdf7eaa 100644 --- a/repos/system_upgrade/common/libraries/persistentnetnames.py +++ b/repos/system_upgrade/common/libraries/persistentnetnames.py @@ -50,7 +50,7 @@ def interfaces(): except Exception as e: # pylint: disable=broad-except # FIXME(msekleta): We should probably handle errors more granularly # Maybe we should inhibit upgrade process at this point - api.current_logger().warning('Failed to gather information about network interface: ' + str(e)) + api.current_logger().warning('Failed to gather information about network interface: %s', e) continue yield Interface(**attrs) diff --git a/repos/system_upgrade/el8toel9/actors/multipathconfread/libraries/multipathconfread.py b/repos/system_upgrade/el8toel9/actors/multipathconfread/libraries/multipathconfread.py index e5b3f06c..5b1cef50 100644 --- a/repos/system_upgrade/el8toel9/actors/multipathconfread/libraries/multipathconfread.py +++ b/repos/system_upgrade/el8toel9/actors/multipathconfread/libraries/multipathconfread.py @@ -68,12 +68,16 @@ def _parse_config_dir(config_dir): res.append(conf) except OSError as e: if e.errno == errno.ENOENT: - api.current_logger().debug('Multipath conf directory ' + - '"{}" doesn\'t exist'.format(config_dir)) + api.current_logger().debug( + 'Multipath conf directory "%s" doesn\'t exist', + config_dir + ) else: - api.current_logger().warning('Failed to read multipath config ' + - 'directory ' + - '"{}": {}'.format(config_dir, e)) + api.current_logger().warning( + 'Failed to read multipath config directory "%s": %s', + config_dir, + e + ) return res -- 2.51.1