ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-04-05 02:58:55 +00:00
Code Packages Projects Releases Wiki Activity

Remove unneccessary imports (#575)

Browse Source 
* Remove unneccessary imports.

* Add noqas.
This commit is contained in:
Felix Fontein 2023-02-09 15:25:45 +01:00 committed by GitHub
parent eb186f0098
commit 54a3dc151d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/remove-unneeded-imports.yml Normal file
View File

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

1
plugins/action/docker_container_copy_into.py
View File

@ -8,7 +8,6 @@ __metaclass__ = type
import base64 import base64
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleError
from ansible.plugins.action import ActionBase from ansible.plugins.action import ActionBase
from ansible.utils.vars import merge_hash from ansible.utils.vars import merge_hash

3
plugins/connection/nsenter.py
View File

@ -45,12 +45,11 @@ notes:
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

1
plugins/module_utils/_api/transport/ssladapter.py
View File

@ -14,7 +14,6 @@ __metaclass__ = type
https://lukasa.co.uk/2013/01/Choosing_SSL_Version_In_Requests/ https://lukasa.co.uk/2013/01/Choosing_SSL_Version_In_Requests/
https://github.com/kennethreitz/requests/pull/799 https://github.com/kennethreitz/requests/pull/799
""" """
import sys
from ansible_collections.community.docker.plugins.module_utils.version import StrictVersion from ansible_collections.community.docker.plugins.module_utils.version import StrictVersion

39
plugins/module_utils/common.py
View File

@ -12,13 +12,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
@ -56,14 +53,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
@ -78,30 +75,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
) )

13
plugins/module_utils/common_api.py
View File

@ -11,10 +11,9 @@ import abc
import os import os
import re import re
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_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
@ -40,18 +39,18 @@ from ansible_collections.community.docker.plugins.module_utils._api.utils.utils
parse_repository_tag, parse_repository_tag,
) )
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_MUTUALLY_EXCLUSIVE, DOCKER_MUTUALLY_EXCLUSIVE,
DOCKER_REQUIRED_TOGETHER, DOCKER_REQUIRED_TOGETHER,
DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_REGISTRY, # TODO: remove
is_image_name_id, is_image_name_id, # TODO: remove
is_valid_tag, is_valid_tag, # TODO: remove
sanitize_result, sanitize_result,
update_tls_hostname, update_tls_hostname,
) )

1
plugins/module_utils/module_container/docker_api.py
View File

@ -108,7 +108,6 @@ from ansible_collections.community.docker.plugins.module_utils._api.errors impor
from ansible_collections.community.docker.plugins.module_utils._api.utils.utils import ( from ansible_collections.community.docker.plugins.module_utils._api.utils.utils import (
convert_port_bindings, convert_port_bindings,
normalize_links, normalize_links,
parse_repository_tag,
) )

1
plugins/module_utils/socket_handler.py
View File

@ -10,7 +10,6 @@ import os
import os.path import os.path
import socket as pysocket import socket as pysocket
from ansible.module_utils.basic import missing_required_lib
from ansible.module_utils.six import PY2 from ansible.module_utils.six import PY2
try: try:

6
plugins/module_utils/util.py
View File

@ -6,17 +6,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

4
plugins/module_utils/version.py
View File

@ -15,10 +15,10 @@ __metaclass__ = type
from ansible.module_utils.six import raise_from from ansible.module_utils.six import raise_from
try: try:
from ansible.module_utils.compat.version import LooseVersion, StrictVersion from ansible.module_utils.compat.version import LooseVersion, StrictVersion # noqa: F401, pylint: disable=unused-import
except ImportError: except ImportError:
try: try:
from distutils.version import LooseVersion, StrictVersion from distutils.version import LooseVersion, StrictVersion # noqa: F401, pylint: disable=unused-import
except ImportError as exc: except ImportError as exc:
msg = 'To use this plugin or module with ansible-core 2.11, you need to use Python < 3.12 with distutils.version present' msg = 'To use this plugin or module with ansible-core 2.11, you need to use Python < 3.12 with distutils.version present'
raise_from(ImportError(msg), exc) raise_from(ImportError(msg), exc)

1
plugins/modules/docker_container_copy_into.py
View File

@ -146,7 +146,6 @@ container_path:
import base64 import base64
import io import io
import os import os
import random
import stat import stat
import traceback import traceback

5
plugins/modules/docker_container_exec.py
View File

@ -167,11 +167,6 @@ from ansible_collections.community.docker.plugins.module_utils.common_api 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 (
DockerSocketHandlerModule, DockerSocketHandlerModule,
) )

3
plugins/modules/docker_volume.py
View File

@ -118,7 +118,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, text_type from ansible.module_utils.six import iteritems
from ansible_collections.community.docker.plugins.module_utils.common_api import ( from ansible_collections.community.docker.plugins.module_utils.common_api import (
AnsibleDockerClient, AnsibleDockerClient,
@ -131,7 +131,6 @@ from ansible_collections.community.docker.plugins.module_utils.util import (
from ansible_collections.community.docker.plugins.module_utils._api.errors import ( from ansible_collections.community.docker.plugins.module_utils._api.errors import (
APIError, APIError,
DockerException, DockerException,
NotFound,
) )