diff --git a/changelogs/fragments/remove-unneeded-imports.yml b/changelogs/fragments/remove-unneeded-imports.yml new file mode 100644 index 00000000..fea3b35c --- /dev/null +++ b/changelogs/fragments/remove-unneeded-imports.yml @@ -0,0 +1,2 @@ +bugfixes: + - "various plugins and modules - remove unnecessary imports (https://github.com/ansible-collections/community.docker/pull/574)." diff --git a/plugins/connection/nsenter.py b/plugins/connection/nsenter.py index 17bef1f9..6d0994c4 100644 --- a/plugins/connection/nsenter.py +++ b/plugins/connection/nsenter.py @@ -44,12 +44,11 @@ DOCUMENTATION = ''' import os import pty -import shutil import subprocess import fcntl import ansible.constants as C -from ansible.errors import AnsibleError, AnsibleFileNotFound +from ansible.errors import AnsibleError from ansible.module_utils.compat import selectors from ansible.module_utils.six import binary_type, text_type from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index 5fe614d3..c14acee3 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -11,13 +11,10 @@ import platform import re import sys import traceback -from datetime import timedelta -from ansible.module_utils.basic import AnsibleModule, env_fallback, missing_required_lib -from ansible.module_utils.common.collections import is_sequence +from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common._collections_compat import Mapping, Sequence from ansible.module_utils.six import string_types -from ansible.module_utils.six.moves.urllib.parse import urlparse from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE, BOOLEANS_FALSE from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion @@ -55,14 +52,14 @@ except ImportError as exc: # installed, as they utilize the same namespace are are incompatible try: # docker (Docker SDK for Python >= 2.0.0) - import docker.models # noqa: F401 + import docker.models # noqa: F401, pylint: disable=unused-import HAS_DOCKER_MODELS = True except ImportError: HAS_DOCKER_MODELS = False try: # docker-py (Docker SDK for Python < 2.0.0) - import docker.ssladapter # noqa: F401 + import docker.ssladapter # noqa: F401, pylint: disable=unused-import HAS_DOCKER_SSLADAPTER = True except ImportError: HAS_DOCKER_SSLADAPTER = False @@ -77,30 +74,30 @@ except ImportError: class RequestException(Exception): pass -from ansible_collections.community.docker.plugins.module_utils.util import ( +from ansible_collections.community.docker.plugins.module_utils.util import ( # noqa: F401, pylint: disable=unused-import DEFAULT_DOCKER_HOST, DEFAULT_TLS, DEFAULT_TLS_VERIFY, - DEFAULT_TLS_HOSTNAME, + DEFAULT_TLS_HOSTNAME, # TODO: remove DEFAULT_TIMEOUT_SECONDS, DOCKER_COMMON_ARGS, - DOCKER_COMMON_ARGS_VARS, + DOCKER_COMMON_ARGS_VARS, # TODO: remove DOCKER_MUTUALLY_EXCLUSIVE, DOCKER_REQUIRED_TOGETHER, - DEFAULT_DOCKER_REGISTRY, - BYTE_SUFFIXES, - is_image_name_id, - is_valid_tag, + DEFAULT_DOCKER_REGISTRY, # TODO: remove + BYTE_SUFFIXES, # TODO: remove + is_image_name_id, # TODO: remove + is_valid_tag, # TODO: remove sanitize_result, - DockerBaseClass, + DockerBaseClass, # TODO: remove update_tls_hostname, - compare_dict_allow_more_present, - compare_generic, - DifferenceTracker, - clean_dict_booleans_for_docker_api, - convert_duration_to_nanosecond, - parse_healthcheck, - omit_none_from_dict, + compare_dict_allow_more_present, # TODO: remove + compare_generic, # TODO: remove + DifferenceTracker, # TODO: remove + clean_dict_booleans_for_docker_api, # TODO: remove + convert_duration_to_nanosecond, # TODO: remove + parse_healthcheck, # TODO: remove + omit_none_from_dict, # TODO: remove ) diff --git a/plugins/module_utils/util.py b/plugins/module_utils/util.py index 44424d0c..1d30560d 100644 --- a/plugins/module_utils/util.py +++ b/plugins/module_utils/util.py @@ -5,17 +5,11 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import abc -import os -import platform import re -import sys -import traceback from datetime import timedelta from ansible.module_utils.basic import env_fallback from ansible.module_utils.common.collections import is_sequence -from ansible.module_utils.common._collections_compat import Sequence from ansible.module_utils.six.moves.urllib.parse import urlparse diff --git a/plugins/module_utils/version.py b/plugins/module_utils/version.py index a236a34d..69c84dad 100644 --- a/plugins/module_utils/version.py +++ b/plugins/module_utils/version.py @@ -14,4 +14,4 @@ __metaclass__ = type # # from ansible.module_utils.compat.version import LooseVersion -from ._version import LooseVersion +from ._version import LooseVersion # noqa: F401, pylint: disable=unused-import diff --git a/plugins/modules/docker_container_exec.py b/plugins/modules/docker_container_exec.py index 3438bc83..1a6b3550 100644 --- a/plugins/modules/docker_container_exec.py +++ b/plugins/modules/docker_container_exec.py @@ -158,11 +158,6 @@ from ansible_collections.community.docker.plugins.module_utils.common import ( RequestException, ) -from ansible_collections.community.docker.plugins.module_utils.socket_helper import ( - shutdown_writing, - write_to_socket, -) - from ansible_collections.community.docker.plugins.module_utils.socket_handler import ( find_selectors, DockerSocketHandlerModule, diff --git a/plugins/modules/docker_login.py b/plugins/modules/docker_login.py index c59524e9..1ee4a9ae 100644 --- a/plugins/modules/docker_login.py +++ b/plugins/modules/docker_login.py @@ -117,7 +117,6 @@ login_results: import base64 import json import os -import re import traceback from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native diff --git a/plugins/modules/docker_volume.py b/plugins/modules/docker_volume.py index 97cfb810..3932eacf 100644 --- a/plugins/modules/docker_volume.py +++ b/plugins/modules/docker_volume.py @@ -111,6 +111,7 @@ volume: import traceback from ansible.module_utils.common.text.converters import to_native +from ansible.module_utils.six import iteritems try: from docker.errors import DockerException, APIError @@ -126,7 +127,6 @@ from ansible_collections.community.docker.plugins.module_utils.util import ( DockerBaseClass, DifferenceTracker, ) -from ansible.module_utils.six import iteritems, text_type class TaskParameters(DockerBaseClass):