From ce83922bd782ed9cc12b300ed3c6987041f3cd70 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 6 Oct 2025 23:24:07 +0200 Subject: [PATCH] Remove some unused and no longer needed imports. This hopefully also fixes the CI issues, which do not happen locally for me... --- plugins/module_utils/_common.py | 48 +---------------------------- plugins/module_utils/_common_api.py | 19 +----------- 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/plugins/module_utils/_common.py b/plugins/module_utils/_common.py index 30e9753d..5d22a065 100644 --- a/plugins/module_utils/_common.py +++ b/plugins/module_utils/_common.py @@ -83,50 +83,7 @@ except ImportError: pass -# pylint: disable=unused-import -from ansible_collections.community.docker.plugins.module_utils._util import ( - BYTE_SUFFIXES, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - DEFAULT_DOCKER_REGISTRY, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - DEFAULT_TLS_HOSTNAME, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - DOCKER_COMMON_ARGS_VARS, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - DifferenceTracker, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - DockerBaseClass, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - clean_dict_booleans_for_docker_api, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - compare_dict_allow_more_present, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - compare_generic, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - convert_duration_to_nanosecond, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - is_image_name_id, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - is_valid_tag, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - omit_none_from_dict, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - parse_healthcheck, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( # noqa: F401 +from ansible_collections.community.docker.plugins.module_utils._util import ( # noqa: F401, pylint: disable=unused-import DEFAULT_DOCKER_HOST, DEFAULT_TIMEOUT_SECONDS, DEFAULT_TLS, @@ -139,9 +96,6 @@ from ansible_collections.community.docker.plugins.module_utils._util import ( # ) -# pylint: enable=unused-import - - MIN_DOCKER_VERSION = "1.8.0" diff --git a/plugins/module_utils/_common_api.py b/plugins/module_utils/_common_api.py index 7c89ee6f..86392762 100644 --- a/plugins/module_utils/_common_api.py +++ b/plugins/module_utils/_common_api.py @@ -46,21 +46,7 @@ from ansible_collections.community.docker.plugins.module_utils._api.utils.utils convert_filters, parse_repository_tag, ) - -# pylint: disable=unused-import -from ansible_collections.community.docker.plugins.module_utils._util import ( - DEFAULT_DOCKER_REGISTRY, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - DEFAULT_TLS_HOSTNAME, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - is_image_name_id, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( - is_valid_tag, # TODO: remove -) -from ansible_collections.community.docker.plugins.module_utils._util import ( # noqa: F401 +from ansible_collections.community.docker.plugins.module_utils._util import ( # noqa: F401, pylint: disable=unused-import DEFAULT_DOCKER_HOST, DEFAULT_TIMEOUT_SECONDS, DEFAULT_TLS, @@ -73,9 +59,6 @@ from ansible_collections.community.docker.plugins.module_utils._util import ( # ) -# pylint: enable=unused-import - - def _get_tls_config(fail_function, **kwargs): try: tls_config = TLSConfig(**kwargs)