From aea3713484547dbb227960f6b400b0fa60044993 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 9 Feb 2023 11:57:54 +0100 Subject: [PATCH] Remove unneccessary imports (#569) * Remove unneccessary imports. * Add noqas. * Add comment which name is actually ignored. --- changelogs/fragments/remove-unneeded-imports.yml | 2 ++ plugins/filter/x509_crl_info.py | 2 +- plugins/module_utils/acme/acme.py | 2 +- plugins/module_utils/crypto/openssh.py | 2 +- plugins/module_utils/version.py | 2 +- plugins/plugin_utils/action_module.py | 4 ++-- 6 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 changelogs/fragments/remove-unneeded-imports.yml diff --git a/changelogs/fragments/remove-unneeded-imports.yml b/changelogs/fragments/remove-unneeded-imports.yml new file mode 100644 index 000000000..805508ec8 --- /dev/null +++ b/changelogs/fragments/remove-unneeded-imports.yml @@ -0,0 +1,2 @@ +bugfixes: + - "various plugins - remove unnecessary imports (https://github.com/ansible-collections/community.crypto/pull/569)." diff --git a/plugins/filter/x509_crl_info.py b/plugins/filter/x509_crl_info.py index c8b026382..11f61fd8a 100644 --- a/plugins/filter/x509_crl_info.py +++ b/plugins/filter/x509_crl_info.py @@ -144,7 +144,7 @@ from ansible.errors import AnsibleFilterError from ansible.module_utils.six import string_types -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 from ansible_collections.community.crypto.plugins.module_utils.crypto.basic import ( OpenSSLObjectError, diff --git a/plugins/module_utils/acme/acme.py b/plugins/module_utils/acme/acme.py index 38ce3dec2..c054a52f6 100644 --- a/plugins/module_utils/acme/acme.py +++ b/plugins/module_utils/acme/acme.py @@ -46,7 +46,7 @@ ) try: - import ipaddress + import ipaddress # noqa: F401, pylint: disable=unused-import except ImportError: HAS_IPADDRESS = False IPADDRESS_IMPORT_ERROR = traceback.format_exc() diff --git a/plugins/module_utils/crypto/openssh.py b/plugins/module_utils/crypto/openssh.py index aac7e43fc..982475385 100644 --- a/plugins/module_utils/crypto/openssh.py +++ b/plugins/module_utils/crypto/openssh.py @@ -8,6 +8,6 @@ __metaclass__ = type # This import is only to maintain backwards compatibility -from ansible_collections.community.crypto.plugins.module_utils.openssh.utils import ( +from ansible_collections.community.crypto.plugins.module_utils.openssh.utils import ( # noqa: F401, pylint: disable=unused-import parse_openssh_version ) diff --git a/plugins/module_utils/version.py b/plugins/module_utils/version.py index d48ceddbd..dc01ffe8f 100644 --- a/plugins/module_utils/version.py +++ b/plugins/module_utils/version.py @@ -15,4 +15,4 @@ # # 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/plugin_utils/action_module.py b/plugins/plugin_utils/action_module.py index 0da994cde..d11fad1f9 100644 --- a/plugins/plugin_utils/action_module.py +++ b/plugins/plugin_utils/action_module.py @@ -69,9 +69,9 @@ # For ansible-core 2.11, we can use the ArgumentSpecValidator. We also import # ModuleArgumentSpecValidator since that indicates that the 'classical' approach # will no longer work. - from ansible.module_utils.common.arg_spec import ( + from ansible.module_utils.common.arg_spec import ( # noqa: F401, pylint: disable=unused-import ArgumentSpecValidator, - ModuleArgumentSpecValidator, # noqa + ModuleArgumentSpecValidator, # ModuleArgumentSpecValidator is not used ) from ansible.module_utils.errors import UnsupportedError HAS_ARGSPEC_VALIDATOR = True