[stable-2] Remove unneccessary imports (#579)

* Remove unneccessary imports (#575)

* Remove unneccessary imports.

* Add noqas.

(cherry picked from commit 54a3dc151d)

* Remove additional unnecessary import.
This commit is contained in:
Felix Fontein 2023-02-09 16:09:00 +01:00 committed by GitHub
parent 1f07bda43a
commit 808063ddcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 37 deletions

View File

@ -0,0 +1,2 @@
bugfixes:
- "various plugins and modules - remove unnecessary imports (https://github.com/ansible-collections/community.docker/pull/574)."

View File

@ -44,12 +44,11 @@ DOCUMENTATION = '''
import os import os
import pty import pty
import shutil
import subprocess import subprocess
import fcntl import fcntl
import ansible.constants as C 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.compat import selectors
from ansible.module_utils.six import binary_type, text_type from ansible.module_utils.six import binary_type, text_type
from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text

View File

@ -11,13 +11,10 @@ import platform
import re import re
import sys import sys
import traceback import traceback
from datetime import timedelta
from ansible.module_utils.basic import AnsibleModule, env_fallback, missing_required_lib from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.common.collections import is_sequence
from ansible.module_utils.common._collections_compat import Mapping, Sequence from ansible.module_utils.common._collections_compat import Mapping, Sequence
from ansible.module_utils.six import string_types 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.module_utils.parsing.convert_bool import BOOLEANS_TRUE, BOOLEANS_FALSE
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion 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 # installed, as they utilize the same namespace are are incompatible
try: try:
# docker (Docker SDK for Python >= 2.0.0) # 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 HAS_DOCKER_MODELS = True
except ImportError: except ImportError:
HAS_DOCKER_MODELS = False HAS_DOCKER_MODELS = False
try: try:
# docker-py (Docker SDK for Python < 2.0.0) # 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 HAS_DOCKER_SSLADAPTER = True
except ImportError: except ImportError:
HAS_DOCKER_SSLADAPTER = False HAS_DOCKER_SSLADAPTER = False
@ -77,30 +74,30 @@ except ImportError:
class RequestException(Exception): class RequestException(Exception):
pass 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_DOCKER_HOST,
DEFAULT_TLS, DEFAULT_TLS,
DEFAULT_TLS_VERIFY, DEFAULT_TLS_VERIFY,
DEFAULT_TLS_HOSTNAME, DEFAULT_TLS_HOSTNAME, # TODO: remove
DEFAULT_TIMEOUT_SECONDS, DEFAULT_TIMEOUT_SECONDS,
DOCKER_COMMON_ARGS, DOCKER_COMMON_ARGS,
DOCKER_COMMON_ARGS_VARS, DOCKER_COMMON_ARGS_VARS, # TODO: remove
DOCKER_MUTUALLY_EXCLUSIVE, DOCKER_MUTUALLY_EXCLUSIVE,
DOCKER_REQUIRED_TOGETHER, DOCKER_REQUIRED_TOGETHER,
DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_REGISTRY, # TODO: remove
BYTE_SUFFIXES, BYTE_SUFFIXES, # TODO: remove
is_image_name_id, is_image_name_id, # TODO: remove
is_valid_tag, is_valid_tag, # TODO: remove
sanitize_result, sanitize_result,
DockerBaseClass, DockerBaseClass, # TODO: remove
update_tls_hostname, update_tls_hostname,
compare_dict_allow_more_present, compare_dict_allow_more_present, # TODO: remove
compare_generic, compare_generic, # TODO: remove
DifferenceTracker, DifferenceTracker, # TODO: remove
clean_dict_booleans_for_docker_api, clean_dict_booleans_for_docker_api, # TODO: remove
convert_duration_to_nanosecond, convert_duration_to_nanosecond, # TODO: remove
parse_healthcheck, parse_healthcheck, # TODO: remove
omit_none_from_dict, omit_none_from_dict, # TODO: remove
) )

View File

@ -5,17 +5,11 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import abc
import os
import platform
import re import re
import sys
import traceback
from datetime import timedelta from datetime import timedelta
from ansible.module_utils.basic import env_fallback from ansible.module_utils.basic import env_fallback
from ansible.module_utils.common.collections import is_sequence 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 from ansible.module_utils.six.moves.urllib.parse import urlparse

View File

@ -14,4 +14,4 @@ __metaclass__ = type
# #
# from ansible.module_utils.compat.version import LooseVersion # from ansible.module_utils.compat.version import LooseVersion
from ._version import LooseVersion from ._version import LooseVersion # noqa: F401, pylint: disable=unused-import

View File

@ -158,11 +158,6 @@ from ansible_collections.community.docker.plugins.module_utils.common import (
RequestException, 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 ( from ansible_collections.community.docker.plugins.module_utils.socket_handler import (
find_selectors, find_selectors,
DockerSocketHandlerModule, DockerSocketHandlerModule,

View File

@ -117,7 +117,6 @@ login_results:
import base64 import base64
import json import json
import os import os
import re
import traceback import traceback
from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native

View File

@ -111,6 +111,7 @@ volume:
import traceback import traceback
from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.common.text.converters import to_native
from ansible.module_utils.six import iteritems
try: try:
from docker.errors import DockerException, APIError from docker.errors import DockerException, APIError
@ -126,7 +127,6 @@ from ansible_collections.community.docker.plugins.module_utils.util import (
DockerBaseClass, DockerBaseClass,
DifferenceTracker, DifferenceTracker,
) )
from ansible.module_utils.six import iteritems, text_type
class TaskParameters(DockerBaseClass): class TaskParameters(DockerBaseClass):