Clean up unused imports in core (#79900)

* Clean up unused imports in core

* Add changelog fragment
pull/79910/head
Matt Clay 3 years ago committed by GitHub
parent b3307f1aa7
commit 833909ac19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
minor_changes:
- Cleaned up unused imports in core.

@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import argparse
import fcntl import fcntl
import hashlib import hashlib
import io import io

@ -6,8 +6,6 @@ __metaclass__ = type
import os import os
from collections import defaultdict
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.cli.galaxy import with_collection_artifacts_manager from ansible.cli.galaxy import with_collection_artifacts_manager
from ansible.galaxy.collection import find_existing_collections from ansible.galaxy.collection import find_existing_collections

@ -10,7 +10,7 @@ HAS_IMPORTLIB_RESOURCES = False
if sys.version_info < (3, 10): if sys.version_info < (3, 10):
try: try:
from importlib_resources import files # type: ignore[import] from importlib_resources import files # type: ignore[import] # pylint: disable=unused-import
except ImportError: except ImportError:
files = None # type: ignore[assignment] files = None # type: ignore[assignment]
else: else:

@ -11,7 +11,6 @@ import os.path
import sys import sys
import stat import stat
import tempfile import tempfile
import traceback
from collections import namedtuple from collections import namedtuple
from collections.abc import Mapping, Sequence from collections.abc import Mapping, Sequence

@ -15,9 +15,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# Make coding more python3-ish from __future__ import annotations
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import multiprocessing.synchronize import multiprocessing.synchronize
@ -29,7 +27,7 @@ if 'action_write_locks' not in globals():
# Do not initialize this more than once because it seems to bash # Do not initialize this more than once because it seems to bash
# the existing one. multiprocessing must be reloading the module # the existing one. multiprocessing must be reloading the module
# when it forks? # when it forks?
action_write_locks = dict() # type: dict[str | None, multiprocessing.synchronize.Lock] action_write_locks: dict[str | None, multiprocessing.synchronize.Lock] = dict()
# Below is a Lock for use when we weren't expecting a named module. It gets used when an action # Below is a Lock for use when we weren't expecting a named module. It gets used when an action
# plugin invokes a module whose name does not match with the action's name. Slightly less # plugin invokes a module whose name does not match with the action's name. Slightly less

@ -27,7 +27,7 @@ from ansible.playbook.task import Task
from ansible.plugins import get_plugin_class from ansible.plugins import get_plugin_class
from ansible.plugins.loader import become_loader, cliconf_loader, connection_loader, httpapi_loader, netconf_loader, terminal_loader from ansible.plugins.loader import become_loader, cliconf_loader, connection_loader, httpapi_loader, netconf_loader, terminal_loader
from ansible.template import Templar from ansible.template import Templar
from ansible.utils.collection_loader import AnsibleCollectionConfig, AnsibleCollectionRef from ansible.utils.collection_loader import AnsibleCollectionConfig
from ansible.utils.listify import listify_lookup_plugin_terms from ansible.utils.listify import listify_lookup_plugin_terms
from ansible.utils.unsafe_proxy import to_unsafe_text, wrap_var from ansible.utils.unsafe_proxy import to_unsafe_text, wrap_var
from ansible.vars.clean import namespace_facts, clean_facts from ansible.vars.clean import namespace_facts, clean_facts

@ -7,7 +7,7 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
try: try:
from resolvelib.resolvers import ( from resolvelib.resolvers import ( # pylint: disable=unused-import
ResolutionImpossible as CollectionDependencyResolutionImpossible, ResolutionImpossible as CollectionDependencyResolutionImpossible,
InconsistentCandidate as CollectionDependencyInconsistentCandidate, InconsistentCandidate as CollectionDependencyInconsistentCandidate,
) )

@ -8,7 +8,7 @@ __metaclass__ = type
import json import json
# Imported for backwards compat # Imported for backwards compat
from ansible.module_utils.common.json import AnsibleJSONEncoder from ansible.module_utils.common.json import AnsibleJSONEncoder # pylint: disable=unused-import
from ansible.parsing.vault import VaultLib from ansible.parsing.vault import VaultLib
from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode

@ -19,14 +19,10 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import string
import sys as _sys import sys as _sys
from collections.abc import Sequence from collections.abc import Sequence
import sys
import yaml
from ansible.module_utils.six import text_type from ansible.module_utils.six import text_type
from ansible.module_utils._text import to_bytes, to_text, to_native from ansible.module_utils._text import to_bytes, to_text, to_native

@ -19,8 +19,6 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
from copy import copy, deepcopy
from ansible.utils.sentinel import Sentinel from ansible.utils.sentinel import Sentinel
_CONTAINERS = frozenset(('list', 'dict', 'set')) _CONTAINERS = frozenset(('list', 'dict', 'set'))

@ -25,10 +25,9 @@ import re
from jinja2.compiler import generate from jinja2.compiler import generate
from jinja2.exceptions import UndefinedError from jinja2.exceptions import UndefinedError
from ansible import constants as C
from ansible.errors import AnsibleError, AnsibleUndefinedVariable from ansible.errors import AnsibleError, AnsibleUndefinedVariable
from ansible.module_utils.six import text_type from ansible.module_utils.six import text_type
from ansible.module_utils._text import to_native, to_text from ansible.module_utils._text import to_native
from ansible.playbook.attribute import FieldAttribute from ansible.playbook.attribute import FieldAttribute
from ansible.utils.display import Display from ansible.utils.display import Display

@ -21,9 +21,8 @@ __metaclass__ = type
import os import os
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleParserError, AnsibleUndefinedVariable, AnsibleFileNotFound, AnsibleAssertionError from ansible.errors import AnsibleParserError, AnsibleUndefinedVariable, AnsibleAssertionError
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
from ansible.module_utils.six import string_types
from ansible.parsing.mod_args import ModuleArgsParser from ansible.parsing.mod_args import ModuleArgsParser
from ansible.utils.display import Display from ansible.utils.display import Display

@ -23,11 +23,9 @@ __metaclass__ = type
from ansible import constants as C from ansible import constants as C
from ansible import context from ansible import context
from ansible.module_utils.compat.paramiko import paramiko
from ansible.playbook.attribute import FieldAttribute from ansible.playbook.attribute import FieldAttribute
from ansible.playbook.base import Base from ansible.playbook.base import Base
from ansible.utils.display import Display from ansible.utils.display import Display
from ansible.utils.ssh_functions import check_for_controlpersist
display = Display() display = Display()

@ -25,7 +25,7 @@ import ansible.constants as C
from ansible.errors import AnsibleParserError, AnsibleAssertionError from ansible.errors import AnsibleParserError, AnsibleAssertionError
from ansible.module_utils._text import to_bytes from ansible.module_utils._text import to_bytes
from ansible.module_utils.six import string_types from ansible.module_utils.six import string_types
from ansible.parsing.splitter import split_args, parse_kv from ansible.parsing.splitter import split_args
from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleMapping from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleMapping
from ansible.playbook.attribute import FieldAttribute from ansible.playbook.attribute import FieldAttribute
from ansible.playbook.base import Base from ansible.playbook.base import Base

@ -23,7 +23,6 @@ from os.path import basename
import ansible.constants as C import ansible.constants as C
from ansible.errors import AnsibleParserError from ansible.errors import AnsibleParserError
from ansible.playbook.attribute import FieldAttribute from ansible.playbook.attribute import FieldAttribute
from ansible.playbook.block import Block
from ansible.playbook.task_include import TaskInclude from ansible.playbook.task_include import TaskInclude
from ansible.playbook.role import Role from ansible.playbook.role import Role
from ansible.playbook.role.include import RoleInclude from ansible.playbook.role.include import RoleInclude

@ -14,7 +14,7 @@ from ansible.errors import AnsibleError
from ansible.module_utils._text import to_native, to_bytes from ansible.module_utils._text import to_native, to_bytes
from ansible.plugins import loader from ansible.plugins import loader
from ansible.utils.display import Display from ansible.utils.display import Display
from ansible.utils.collection_loader._collection_finder import _get_collection_path, AnsibleCollectionRef from ansible.utils.collection_loader._collection_finder import _get_collection_path
display = Display() display = Display()

@ -30,7 +30,7 @@ from ansible.plugins import get_plugin_class, MODULE_CACHE, PATH_CACHE, PLUGIN_P
from ansible.utils.collection_loader import AnsibleCollectionConfig, AnsibleCollectionRef from ansible.utils.collection_loader import AnsibleCollectionConfig, AnsibleCollectionRef
from ansible.utils.collection_loader._collection_finder import _AnsibleCollectionFinder, _get_collection_metadata from ansible.utils.collection_loader._collection_finder import _AnsibleCollectionFinder, _get_collection_metadata
from ansible.utils.display import Display from ansible.utils.display import Display
from ansible.utils.plugin_docs import add_fragments, find_plugin_docfile from ansible.utils.plugin_docs import add_fragments
# TODO: take the packaging dep, or vendor SpecifierSet? # TODO: take the packaging dep, or vendor SpecifierSet?

@ -57,7 +57,7 @@ from collections.abc import Mapping, Set
from ansible.module_utils._text import to_bytes, to_text from ansible.module_utils._text import to_bytes, to_text
from ansible.module_utils.common.collections import is_sequence from ansible.module_utils.common.collections import is_sequence
from ansible.module_utils.six import string_types, binary_type, text_type from ansible.module_utils.six import binary_type, text_type
from ansible.utils.native_jinja import NativeJinjaText from ansible.utils.native_jinja import NativeJinjaText

@ -9,8 +9,6 @@ import re
from ansible.module_utils.compat.version import LooseVersion, Version from ansible.module_utils.compat.version import LooseVersion, Version
from ansible.module_utils.six import text_type
# Regular expression taken from # Regular expression taken from
# https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string # https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string

@ -13,7 +13,6 @@ from collections.abc import MutableMapping, MutableSequence
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.module_utils import six from ansible.module_utils import six
from ansible.module_utils._text import to_text
from ansible.plugins.loader import connection_loader from ansible.plugins.loader import connection_loader
from ansible.utils.display import Display from ansible.utils.display import Display

Loading…
Cancel
Save