Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unneccessary imports #5940

Merged
merged 4 commits into from
Feb 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/remove-unneeded-imports.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- "various plugins and modules - remove unnecessary imports (https://github.com/ansible-collections/community.general/pull/5940)."
2 changes: 0 additions & 2 deletions plugins/cache/memcached.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,9 @@
from multiprocessing import Lock
from itertools import chain

from ansible import constants as C
from ansible.errors import AnsibleError
from ansible.module_utils.common._collections_compat import MutableSet
from ansible.plugins.cache import BaseCacheModule
from ansible.release import __version__ as ansible_base_version
from ansible.utils.display import Display

try:
Expand Down
2 changes: 0 additions & 2 deletions plugins/cache/redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,10 @@
import time
import json

from ansible import constants as C
from ansible.errors import AnsibleError
from ansible.module_utils.common.text.converters import to_native
from ansible.parsing.ajson import AnsibleJSONEncoder, AnsibleJSONDecoder
from ansible.plugins.cache import BaseCacheModule
from ansible.release import __version__ as ansible_base_version
from ansible.utils.display import Display

try:
Expand Down
1 change: 0 additions & 1 deletion plugins/callback/counter_enabled.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
from ansible import constants as C
from ansible.plugins.callback import CallbackBase
from ansible.utils.color import colorize, hostcolor
from ansible.template import Templar
from ansible.playbook.task_include import TaskInclude


Expand Down
4 changes: 0 additions & 4 deletions plugins/callback/diy.py
Original file line number Diff line number Diff line change
Expand Up @@ -786,10 +786,6 @@

import sys
from contextlib import contextmanager
from ansible import constants as C
from ansible.playbook.task_include import TaskInclude
from ansible.plugins.callback import CallbackBase
from ansible.utils.color import colorize, hostcolor
from ansible.template import Templar
from ansible.vars.manager import VariableManager
from ansible.plugins.callback.default import CallbackModule as Default
Expand Down
1 change: 0 additions & 1 deletion plugins/callback/loganalytics.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
import hashlib
import hmac
import base64
import logging
import json
import uuid
import socket
Expand Down
1 change: 0 additions & 1 deletion plugins/callback/mail.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
import email.utils
import smtplib

from ansible.module_utils.six import string_types
from ansible.module_utils.common.text.converters import to_bytes
from ansible.parsing.ajson import AnsibleJSONEncoder
from ansible.plugins.callback import CallbackBase
Expand Down
3 changes: 0 additions & 3 deletions plugins/callback/nrdp.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@
type: string
'''

import os
import json

from ansible.module_utils.six.moves.urllib.parse import urlencode
from ansible.module_utils.common.text.converters import to_bytes
from ansible.module_utils.urls import open_url
Expand Down
3 changes: 0 additions & 3 deletions plugins/callback/syslog_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@
version_added: 4.5.0
'''

import os
import json

import logging
import logging.handlers

Expand Down
6 changes: 2 additions & 4 deletions plugins/callback/yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@
import json
import re
import string
import sys

from ansible.module_utils.common.text.converters import to_bytes, to_text
from ansible.module_utils.six import string_types
from ansible.module_utils.common.text.converters import to_text
from ansible.parsing.yaml.dumper import AnsibleDumper
from ansible.plugins.callback import CallbackBase, strip_internal_keys, module_response_deepcopy
from ansible.plugins.callback import strip_internal_keys, module_response_deepcopy
from ansible.plugins.callback.default import CallbackModule as Default


Expand Down
6 changes: 3 additions & 3 deletions plugins/filter/jc.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@
import importlib

try:
import jc
import jc # noqa: F401, pylint: disable=unused-import
HAS_LIB = True
except ImportError:
HAS_LIB = False


def jc(data, parser, quiet=True, raw=False):
def jc_filter(data, parser, quiet=True, raw=False):
"""Convert returned command output to JSON using the JC library

Arguments:
Expand Down Expand Up @@ -150,5 +150,5 @@ class FilterModule(object):

def filters(self):
return {
'jc': jc
'jc': jc_filter,
}
2 changes: 0 additions & 2 deletions plugins/filter/lists_mergeby.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@
from ansible.module_utils.six import string_types
from ansible.module_utils.common._collections_compat import Mapping, Sequence
from ansible.utils.vars import merge_hash
from ansible.release import __version__ as ansible_version
from ansible_collections.community.general.plugins.module_utils.version import LooseVersion

from collections import defaultdict
from operator import itemgetter
Expand Down
5 changes: 1 addition & 4 deletions plugins/inventory/linode.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,7 @@
ansible_host: "ipv4 | community.general.json_query('[?public==`false`].address') | first"
'''

import os

from ansible.errors import AnsibleError, AnsibleParserError
from ansible.module_utils.six import string_types
from ansible.errors import AnsibleError
from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable


Expand Down
2 changes: 0 additions & 2 deletions plugins/inventory/lxd.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,10 @@
attribute: internals
'''

import binascii
import json
import re
import time
import os
import socket
from ansible.plugins.inventory import BaseInventoryPlugin
from ansible.module_utils.common.text.converters import to_native, to_text
from ansible.module_utils.common.dict_transformations import dict_merge
Expand Down
2 changes: 1 addition & 1 deletion plugins/inventory/online.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
from ansible.errors import AnsibleError
from ansible.module_utils.urls import open_url
from ansible.plugins.inventory import BaseInventoryPlugin
from ansible.module_utils.common.text.converters import to_native, to_text
from ansible.module_utils.common.text.converters import to_text
from ansible.module_utils.ansible_release import __version__ as ansible_version
from ansible.module_utils.six.moves.urllib.parse import urljoin

Expand Down
1 change: 0 additions & 1 deletion plugins/lookup/consul_kv.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
type: dict
"""

import os
from ansible.module_utils.six.moves.urllib.parse import urlparse
from ansible.errors import AnsibleError, AnsibleAssertionError
from ansible.plugins.lookup import LookupBase
Expand Down
2 changes: 0 additions & 2 deletions plugins/lookup/credstash.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@
type: str
"""

import os

from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase

Expand Down
1 change: 0 additions & 1 deletion plugins/lookup/cyberarkpassword.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@

from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase
from ansible.parsing.splitter import parse_kv
from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native
from ansible.utils.display import Display

Expand Down
5 changes: 2 additions & 3 deletions plugins/lookup/etcd3.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,11 @@

import re

from ansible.plugins.lookup import LookupBase
from ansible.utils.display import Display
from ansible.errors import AnsibleLookupError
from ansible.module_utils.basic import missing_required_lib
from ansible.module_utils.common.text.converters import to_native
from ansible.plugins.lookup import LookupBase
from ansible.errors import AnsibleError, AnsibleLookupError
from ansible.utils.display import Display

try:
import etcd3
Expand Down
2 changes: 0 additions & 2 deletions plugins/lookup/hiera.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@
elements: str
"""

import os

from ansible.plugins.lookup import LookupBase
from ansible.utils.cmd_functions import run_cmd
from ansible.module_utils.common.text.converters import to_text
Expand Down
1 change: 0 additions & 1 deletion plugins/lookup/manifold.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
from traceback import format_exception
import json
import sys
import os

display = Display()

Expand Down
2 changes: 0 additions & 2 deletions plugins/lookup/redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@
elements: str
"""

import os

HAVE_REDIS = False
try:
import redis
Expand Down
7 changes: 4 additions & 3 deletions plugins/module_utils/dimensiondata.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@
import re
import traceback

from ansible.module_utils.basic import AnsibleModule, missing_required_lib
# (TODO: remove AnsibleModule from next line!)
from ansible.module_utils.basic import AnsibleModule, missing_required_lib # noqa: F401, pylint: disable=unused-import
from ansible.module_utils.six.moves import configparser
from os.path import expanduser
from uuid import UUID

LIBCLOUD_IMP_ERR = None
try:
from libcloud.common.dimensiondata import API_ENDPOINTS, DimensionDataAPIException, DimensionDataStatus
from libcloud.compute.base import Node, NodeLocation
from libcloud.common.dimensiondata import API_ENDPOINTS, DimensionDataAPIException, DimensionDataStatus # noqa: F401, pylint: disable=unused-import
felixfontein marked this conversation as resolved.
Show resolved Hide resolved
from libcloud.compute.base import Node, NodeLocation # noqa: F401, pylint: disable=unused-import
from libcloud.compute.providers import get_driver
from libcloud.compute.types import Provider

Expand Down
4 changes: 2 additions & 2 deletions plugins/module_utils/influxdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

REQUESTS_IMP_ERR = None
try:
import requests.exceptions
import requests.exceptions # noqa: F401, pylint: disable=unused-import
HAS_REQUESTS = True
except ImportError:
REQUESTS_IMP_ERR = traceback.format_exc()
Expand All @@ -25,7 +25,7 @@
try:
from influxdb import InfluxDBClient
from influxdb import __version__ as influxdb_version
from influxdb import exceptions
from influxdb import exceptions # noqa: F401, pylint: disable=unused-import
HAS_INFLUXDB = True
except ImportError:
INFLUXDB_IMP_ERR = traceback.format_exc()
Expand Down
3 changes: 2 additions & 1 deletion plugins/module_utils/mh/module_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

from ansible.module_utils.common.dict_transformations import dict_merge

from ansible_collections.community.general.plugins.module_utils.mh.base import ModuleHelperBase, AnsibleModule
# (TODO: remove AnsibleModule!) pylint: disable-next-line=unused-import
from ansible_collections.community.general.plugins.module_utils.mh.base import ModuleHelperBase, AnsibleModule # noqa: F401
from ansible_collections.community.general.plugins.module_utils.mh.mixins.cmd import CmdMixin
from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin
from ansible_collections.community.general.plugins.module_utils.mh.mixins.deps import DependencyMixin
Expand Down
15 changes: 8 additions & 7 deletions plugins/module_utils/module_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
__metaclass__ = type


from ansible_collections.community.general.plugins.module_utils.mh.module_helper import (
from ansible_collections.community.general.plugins.module_utils.mh.module_helper import ( # noqa: F401, pylint: disable=unused-import
ModuleHelper, StateModuleHelper, CmdModuleHelper, CmdStateModuleHelper, AnsibleModule
)
from ansible_collections.community.general.plugins.module_utils.mh.mixins.cmd import CmdMixin, ArgFormat
from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin
from ansible_collections.community.general.plugins.module_utils.mh.mixins.deps import DependencyCtxMgr
from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException
from ansible_collections.community.general.plugins.module_utils.mh.deco import cause_changes, module_fails_on_exception
from ansible_collections.community.general.plugins.module_utils.mh.mixins.vars import VarMeta, VarDict
from ansible_collections.community.general.plugins.module_utils.mh.mixins.cmd import CmdMixin, ArgFormat # noqa: F401, pylint: disable=unused-import
from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin # noqa: F401, pylint: disable=unused-import
from ansible_collections.community.general.plugins.module_utils.mh.mixins.deps import DependencyCtxMgr # noqa: F401, pylint: disable=unused-import
from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException # noqa: F401, pylint: disable=unused-import
# pylint: disable-next-line=unused-import
from ansible_collections.community.general.plugins.module_utils.mh.deco import cause_changes, module_fails_on_exception # noqa: F401
from ansible_collections.community.general.plugins.module_utils.mh.mixins.vars import VarMeta, VarDict # noqa: F401, pylint: disable=unused-import
3 changes: 2 additions & 1 deletion plugins/module_utils/oneview.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
import abc
import collections
import json
import os
# (TODO: remove next line!)
import os # noqa: F401, pylint: disable=unused-import
import traceback

HPE_ONEVIEW_IMP_ERR = None
Expand Down
5 changes: 3 additions & 2 deletions plugins/module_utils/oracle/oci_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
import logging.config
import os
import tempfile
from datetime import datetime
# (TODO: remove next line!)
from datetime import datetime # noqa: F401, pylint: disable=unused-import
from operator import eq

import time

try:
import yaml
import yaml # noqa: F401, pylint: disable=unused-import

import oci
from oci.constants import HEADER_NEXT_PAGE
Expand Down
12 changes: 8 additions & 4 deletions plugins/module_utils/proxmox.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
from __future__ import absolute_import, division, print_function
__metaclass__ = type

import atexit
import time
import re
# (TODO: remove next line!)
import atexit # noqa: F401, pylint: disable=unused-import
# (TODO: remove next line!)
import time # noqa: F401, pylint: disable=unused-import
# (TODO: remove next line!)
import re # noqa: F401, pylint: disable=unused-import
import traceback

PROXMOXER_IMP_ERR = None
Expand All @@ -22,7 +25,8 @@


from ansible.module_utils.basic import env_fallback, missing_required_lib
from ansible.module_utils.common.text.converters import to_native
# (TODO: remove next line!)
from ansible.module_utils.common.text.converters import to_native # noqa: F401, pylint: disable=unused-import
from ansible_collections.community.general.plugins.module_utils.version import LooseVersion


Expand Down
8 changes: 5 additions & 3 deletions plugins/module_utils/pure.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@

HAS_PURITY_FB = True
try:
from purity_fb import PurityFb, FileSystem, FileSystemSnapshot, SnapshotSuffix, rest
from purity_fb import PurityFb, FileSystem, FileSystemSnapshot, SnapshotSuffix, rest # noqa: F401, pylint: disable=unused-import
felixfontein marked this conversation as resolved.
Show resolved Hide resolved
except ImportError:
HAS_PURITY_FB = False

from functools import wraps
# (TODO: remove next line!)
from functools import wraps # noqa: F401, pylint: disable=unused-import
from os import environ
from os import path
# (TODO: remove next line!)
from os import path # noqa: F401, pylint: disable=unused-import
import platform

VERSION = 1.2
Expand Down
4 changes: 2 additions & 2 deletions plugins/module_utils/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
from ansible.module_utils.six import raise_from

try:
from ansible.module_utils.compat.version import LooseVersion
from ansible.module_utils.compat.version import LooseVersion # noqa: F401, pylint: disable=unused-import
except ImportError:
try:
from distutils.version import LooseVersion
from distutils.version import LooseVersion # noqa: F401, pylint: disable=unused-import
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'
raise_from(ImportError(msg), exc)
2 changes: 1 addition & 1 deletion plugins/modules/gitlab_project_variable.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@

GITLAB_IMP_ERR = None
try:
import gitlab
import gitlab # noqa: F401, pylint: disable=unused-import
HAS_GITLAB_PACKAGE = True
except Exception:
GITLAB_IMP_ERR = traceback.format_exc()
Expand Down
Loading