From 9f899f94924fafeb330b1e8b18c970742da56e0d Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 4 Oct 2023 18:11:17 -0400 Subject: [PATCH] Require `from __future__ import annotations` (#81902) --- .azure-pipelines/scripts/combine-coverage.py | 3 +-- .azure-pipelines/scripts/publish-codecov.py | 1 + .azure-pipelines/scripts/time-command.py | 3 +-- hacking/azp/download.py | 3 +-- hacking/azp/get_recent_coverage_runs.py | 3 +-- hacking/azp/incidental.py | 3 +-- hacking/azp/run.py | 3 +-- hacking/backport/backport_of_line_adder.py | 4 +--- hacking/report.py | 3 +-- hacking/return_skeleton_generator.py | 3 +-- hacking/test-module.py | 3 +-- hacking/tests/gen_distribution_version_testcase.py | 3 +-- lib/ansible/__init__.py | 4 +--- lib/ansible/__main__.py | 1 + lib/ansible/_vendor/__init__.py | 3 +-- lib/ansible/cli/__init__.py | 4 +--- lib/ansible/cli/adhoc.py | 3 +-- lib/ansible/cli/arguments/__init__.py | 3 +-- lib/ansible/cli/arguments/option_helpers.py | 3 +-- lib/ansible/cli/config.py | 3 +-- lib/ansible/cli/console.py | 3 +-- lib/ansible/cli/doc.py | 3 +-- lib/ansible/cli/galaxy.py | 3 +-- lib/ansible/cli/inventory.py | 3 +-- lib/ansible/cli/playbook.py | 3 +-- lib/ansible/cli/pull.py | 3 +-- lib/ansible/cli/scripts/ansible_connection_cli_stub.py | 5 +---- lib/ansible/cli/vault.py | 3 +-- lib/ansible/collections/list.py | 1 + lib/ansible/compat/__init__.py | 5 +---- lib/ansible/compat/importlib_resources.py | 3 +-- lib/ansible/compat/selectors/__init__.py | 6 ++---- lib/ansible/config/manager.py | 3 +-- lib/ansible/constants.py | 3 +-- lib/ansible/context.py | 5 +---- lib/ansible/errors/__init__.py | 4 +--- lib/ansible/errors/yaml_strings.py | 4 +--- lib/ansible/executor/__init__.py | 4 +--- lib/ansible/executor/discovery/python_target.py | 3 +-- lib/ansible/executor/interpreter_discovery.py | 3 +-- lib/ansible/executor/module_common.py | 4 +--- lib/ansible/executor/play_iterator.py | 4 +--- lib/ansible/executor/playbook_executor.py | 4 +--- lib/ansible/executor/powershell/module_manifest.py | 3 +-- lib/ansible/executor/process/__init__.py | 4 +--- lib/ansible/executor/process/worker.py | 4 +--- lib/ansible/executor/stats.py | 4 +--- lib/ansible/executor/task_executor.py | 3 +-- lib/ansible/executor/task_queue_manager.py | 4 +--- lib/ansible/executor/task_result.py | 3 +-- lib/ansible/galaxy/__init__.py | 3 +-- lib/ansible/galaxy/api.py | 3 +-- lib/ansible/galaxy/collection/__init__.py | 3 +-- .../galaxy/collection/concrete_artifact_manager.py | 3 +-- lib/ansible/galaxy/collection/galaxy_api_proxy.py | 3 +-- lib/ansible/galaxy/collection/gpg.py | 6 ++++-- lib/ansible/galaxy/dependency_resolution/__init__.py | 3 +-- .../galaxy/dependency_resolution/dataclasses.py | 3 +-- lib/ansible/galaxy/dependency_resolution/errors.py | 3 +-- lib/ansible/galaxy/dependency_resolution/providers.py | 3 +-- lib/ansible/galaxy/dependency_resolution/reporters.py | 3 +-- lib/ansible/galaxy/dependency_resolution/resolvers.py | 3 +-- lib/ansible/galaxy/dependency_resolution/versioning.py | 3 +-- lib/ansible/galaxy/role.py | 3 +-- lib/ansible/galaxy/token.py | 3 +-- lib/ansible/galaxy/user_agent.py | 3 +-- lib/ansible/inventory/data.py | 3 +-- lib/ansible/inventory/group.py | 3 +-- lib/ansible/inventory/helpers.py | 3 +-- lib/ansible/inventory/host.py | 4 +--- lib/ansible/inventory/manager.py | 3 +-- lib/ansible/module_utils/_text.py | 3 +-- lib/ansible/module_utils/api.py | 3 +-- lib/ansible/module_utils/common/_collections_compat.py | 3 +-- lib/ansible/module_utils/common/_utils.py | 4 +--- lib/ansible/module_utils/common/arg_spec.py | 3 +-- lib/ansible/module_utils/common/collections.py | 3 +-- .../module_utils/common/dict_transformations.py | 3 +-- lib/ansible/module_utils/common/file.py | 3 +-- lib/ansible/module_utils/common/json.py | 4 +--- lib/ansible/module_utils/common/locale.py | 3 +-- lib/ansible/module_utils/common/network.py | 3 +-- lib/ansible/module_utils/common/parameters.py | 3 +-- lib/ansible/module_utils/common/process.py | 3 +-- lib/ansible/module_utils/common/respawn.py | 3 +-- lib/ansible/module_utils/common/sys_info.py | 3 +-- lib/ansible/module_utils/common/text/converters.py | 3 +-- lib/ansible/module_utils/common/text/formatters.py | 3 +-- lib/ansible/module_utils/common/validation.py | 3 +-- lib/ansible/module_utils/common/warnings.py | 3 +-- lib/ansible/module_utils/common/yaml.py | 3 +-- lib/ansible/module_utils/compat/_selectors2.py | 1 + lib/ansible/module_utils/compat/datetime.py | 4 +--- lib/ansible/module_utils/compat/importlib.py | 4 +--- lib/ansible/module_utils/compat/paramiko.py | 3 +-- lib/ansible/module_utils/compat/selectors.py | 5 ++--- lib/ansible/module_utils/compat/selinux.py | 3 +-- lib/ansible/module_utils/compat/typing.py | 3 +-- lib/ansible/module_utils/compat/version.py | 3 +-- lib/ansible/module_utils/connection.py | 3 +-- lib/ansible/module_utils/distro/__init__.py | 5 ++--- lib/ansible/module_utils/distro/_distro.py | 1 + lib/ansible/module_utils/errors.py | 3 +-- lib/ansible/module_utils/facts/__init__.py | 3 +-- lib/ansible/module_utils/facts/ansible_collector.py | 3 +-- lib/ansible/module_utils/facts/collector.py | 3 +-- lib/ansible/module_utils/facts/compat.py | 3 +-- lib/ansible/module_utils/facts/default_collectors.py | 3 +-- lib/ansible/module_utils/facts/hardware/aix.py | 3 +-- lib/ansible/module_utils/facts/hardware/base.py | 3 +-- lib/ansible/module_utils/facts/hardware/darwin.py | 3 +-- lib/ansible/module_utils/facts/hardware/dragonfly.py | 3 +-- lib/ansible/module_utils/facts/hardware/freebsd.py | 3 +-- lib/ansible/module_utils/facts/hardware/hpux.py | 3 +-- lib/ansible/module_utils/facts/hardware/hurd.py | 3 +-- lib/ansible/module_utils/facts/hardware/linux.py | 3 +-- lib/ansible/module_utils/facts/hardware/netbsd.py | 3 +-- lib/ansible/module_utils/facts/hardware/openbsd.py | 3 +-- lib/ansible/module_utils/facts/hardware/sunos.py | 3 +-- lib/ansible/module_utils/facts/namespace.py | 3 +-- lib/ansible/module_utils/facts/network/aix.py | 3 +-- lib/ansible/module_utils/facts/network/base.py | 3 +-- lib/ansible/module_utils/facts/network/darwin.py | 3 +-- lib/ansible/module_utils/facts/network/dragonfly.py | 3 +-- lib/ansible/module_utils/facts/network/fc_wwn.py | 3 +-- lib/ansible/module_utils/facts/network/freebsd.py | 3 +-- lib/ansible/module_utils/facts/network/generic_bsd.py | 3 +-- lib/ansible/module_utils/facts/network/hpux.py | 3 +-- lib/ansible/module_utils/facts/network/hurd.py | 3 +-- lib/ansible/module_utils/facts/network/iscsi.py | 3 +-- lib/ansible/module_utils/facts/network/linux.py | 3 +-- lib/ansible/module_utils/facts/network/netbsd.py | 3 +-- lib/ansible/module_utils/facts/network/nvme.py | 3 +-- lib/ansible/module_utils/facts/network/openbsd.py | 3 +-- lib/ansible/module_utils/facts/network/sunos.py | 3 +-- lib/ansible/module_utils/facts/other/facter.py | 3 +-- lib/ansible/module_utils/facts/other/ohai.py | 3 +-- lib/ansible/module_utils/facts/packages.py | 3 +-- lib/ansible/module_utils/facts/sysctl.py | 3 +-- lib/ansible/module_utils/facts/system/apparmor.py | 3 +-- lib/ansible/module_utils/facts/system/caps.py | 3 +-- lib/ansible/module_utils/facts/system/chroot.py | 3 +-- lib/ansible/module_utils/facts/system/cmdline.py | 3 +-- lib/ansible/module_utils/facts/system/date_time.py | 3 +-- lib/ansible/module_utils/facts/system/distribution.py | 3 +-- lib/ansible/module_utils/facts/system/dns.py | 3 +-- lib/ansible/module_utils/facts/system/env.py | 3 +-- lib/ansible/module_utils/facts/system/fips.py | 3 +-- lib/ansible/module_utils/facts/system/loadavg.py | 3 +-- lib/ansible/module_utils/facts/system/local.py | 3 +-- lib/ansible/module_utils/facts/system/lsb.py | 3 +-- lib/ansible/module_utils/facts/system/pkg_mgr.py | 3 +-- lib/ansible/module_utils/facts/system/platform.py | 3 +-- lib/ansible/module_utils/facts/system/python.py | 3 +-- lib/ansible/module_utils/facts/system/selinux.py | 3 +-- lib/ansible/module_utils/facts/system/service_mgr.py | 3 +-- lib/ansible/module_utils/facts/system/ssh_pub_keys.py | 3 +-- lib/ansible/module_utils/facts/system/user.py | 3 +-- lib/ansible/module_utils/facts/timeout.py | 3 +-- lib/ansible/module_utils/facts/utils.py | 3 +-- lib/ansible/module_utils/facts/virtual/base.py | 3 +-- lib/ansible/module_utils/facts/virtual/dragonfly.py | 3 +-- lib/ansible/module_utils/facts/virtual/freebsd.py | 3 +-- lib/ansible/module_utils/facts/virtual/hpux.py | 3 +-- lib/ansible/module_utils/facts/virtual/linux.py | 3 +-- lib/ansible/module_utils/facts/virtual/netbsd.py | 3 +-- lib/ansible/module_utils/facts/virtual/openbsd.py | 3 +-- lib/ansible/module_utils/facts/virtual/sunos.py | 3 +-- lib/ansible/module_utils/facts/virtual/sysctl.py | 3 +-- lib/ansible/module_utils/json_utils.py | 3 +-- lib/ansible/module_utils/parsing/convert_bool.py | 3 +-- lib/ansible/module_utils/pycompat24.py | 3 +-- lib/ansible/module_utils/service.py | 3 +-- lib/ansible/module_utils/six/__init__.py | 2 +- lib/ansible/module_utils/splitter.py | 3 +-- lib/ansible/module_utils/urls.py | 3 +-- lib/ansible/module_utils/yumdnf.py | 3 +-- lib/ansible/modules/add_host.py | 3 +-- lib/ansible/modules/apt.py | 3 +-- lib/ansible/modules/apt_key.py | 3 +-- lib/ansible/modules/apt_repository.py | 3 +-- lib/ansible/modules/assemble.py | 3 +-- lib/ansible/modules/assert.py | 3 +-- lib/ansible/modules/async_status.py | 3 +-- lib/ansible/modules/async_wrapper.py | 3 +-- lib/ansible/modules/blockinfile.py | 3 +-- lib/ansible/modules/command.py | 3 +-- lib/ansible/modules/copy.py | 3 +-- lib/ansible/modules/cron.py | 3 +-- lib/ansible/modules/deb822_repository.py | 3 +-- lib/ansible/modules/debconf.py | 3 +-- lib/ansible/modules/debug.py | 3 +-- lib/ansible/modules/dnf.py | 3 +-- lib/ansible/modules/dnf5.py | 3 +-- lib/ansible/modules/dpkg_selections.py | 3 +-- lib/ansible/modules/expect.py | 3 +-- lib/ansible/modules/fail.py | 3 +-- lib/ansible/modules/fetch.py | 3 +-- lib/ansible/modules/file.py | 3 +-- lib/ansible/modules/find.py | 3 +-- lib/ansible/modules/gather_facts.py | 3 +-- lib/ansible/modules/get_url.py | 3 +-- lib/ansible/modules/getent.py | 3 +-- lib/ansible/modules/git.py | 3 +-- lib/ansible/modules/group.py | 3 +-- lib/ansible/modules/group_by.py | 3 +-- lib/ansible/modules/hostname.py | 3 +-- lib/ansible/modules/import_playbook.py | 3 +-- lib/ansible/modules/import_role.py | 3 +-- lib/ansible/modules/import_tasks.py | 3 +-- lib/ansible/modules/include_role.py | 3 +-- lib/ansible/modules/include_tasks.py | 3 +-- lib/ansible/modules/include_vars.py | 3 +-- lib/ansible/modules/iptables.py | 3 +-- lib/ansible/modules/known_hosts.py | 3 +-- lib/ansible/modules/lineinfile.py | 3 +-- lib/ansible/modules/meta.py | 3 +-- lib/ansible/modules/package.py | 3 +-- lib/ansible/modules/package_facts.py | 3 +-- lib/ansible/modules/pause.py | 3 +-- lib/ansible/modules/ping.py | 3 +-- lib/ansible/modules/pip.py | 3 +-- lib/ansible/modules/raw.py | 3 +-- lib/ansible/modules/reboot.py | 3 +-- lib/ansible/modules/replace.py | 3 +-- lib/ansible/modules/rpm_key.py | 3 +-- lib/ansible/modules/script.py | 3 +-- lib/ansible/modules/service.py | 3 +-- lib/ansible/modules/service_facts.py | 3 +-- lib/ansible/modules/set_fact.py | 3 +-- lib/ansible/modules/set_stats.py | 3 +-- lib/ansible/modules/setup.py | 3 +-- lib/ansible/modules/shell.py | 3 +-- lib/ansible/modules/slurp.py | 3 +-- lib/ansible/modules/stat.py | 3 +-- lib/ansible/modules/subversion.py | 3 +-- lib/ansible/modules/systemd_service.py | 3 +-- lib/ansible/modules/sysvinit.py | 3 +-- lib/ansible/modules/tempfile.py | 3 +-- lib/ansible/modules/template.py | 3 +-- lib/ansible/modules/unarchive.py | 3 +-- lib/ansible/modules/uri.py | 3 +-- lib/ansible/modules/user.py | 3 +-- lib/ansible/modules/validate_argument_spec.py | 3 +-- lib/ansible/modules/wait_for.py | 3 +-- lib/ansible/modules/wait_for_connection.py | 3 +-- lib/ansible/modules/yum.py | 3 +-- lib/ansible/modules/yum_repository.py | 3 +-- lib/ansible/parsing/__init__.py | 4 +--- lib/ansible/parsing/ajson.py | 4 +--- lib/ansible/parsing/dataloader.py | 4 +--- lib/ansible/parsing/mod_args.py | 4 +--- lib/ansible/parsing/plugin_docs.py | 3 +-- lib/ansible/parsing/quoting.py | 4 +--- lib/ansible/parsing/splitter.py | 4 +--- lib/ansible/parsing/utils/__init__.py | 4 +--- lib/ansible/parsing/utils/addresses.py | 4 +--- lib/ansible/parsing/utils/jsonify.py | 4 +--- lib/ansible/parsing/utils/yaml.py | 4 +--- lib/ansible/parsing/vault/__init__.py | 4 +--- lib/ansible/parsing/yaml/__init__.py | 4 +--- lib/ansible/parsing/yaml/constructor.py | 4 +--- lib/ansible/parsing/yaml/dumper.py | 4 +--- lib/ansible/parsing/yaml/loader.py | 4 +--- lib/ansible/parsing/yaml/objects.py | 4 +--- lib/ansible/playbook/__init__.py | 4 +--- lib/ansible/playbook/attribute.py | 4 +--- lib/ansible/playbook/base.py | 3 +-- lib/ansible/playbook/block.py | 4 +--- lib/ansible/playbook/collectionsearch.py | 3 +-- lib/ansible/playbook/conditional.py | 4 +--- lib/ansible/playbook/delegatable.py | 1 + lib/ansible/playbook/handler.py | 4 +--- lib/ansible/playbook/handler_task_include.py | 4 +--- lib/ansible/playbook/helpers.py | 3 +-- lib/ansible/playbook/included_file.py | 4 +--- lib/ansible/playbook/loop_control.py | 4 +--- lib/ansible/playbook/notifiable.py | 1 + lib/ansible/playbook/play.py | 4 +--- lib/ansible/playbook/play_context.py | 4 +--- lib/ansible/playbook/playbook_include.py | 4 +--- lib/ansible/playbook/role/__init__.py | 4 +--- lib/ansible/playbook/role/definition.py | 4 +--- lib/ansible/playbook/role/include.py | 4 +--- lib/ansible/playbook/role/metadata.py | 4 +--- lib/ansible/playbook/role/requirement.py | 4 +--- lib/ansible/playbook/role_include.py | 4 +--- lib/ansible/playbook/taggable.py | 4 +--- lib/ansible/playbook/task.py | 4 +--- lib/ansible/playbook/task_include.py | 4 +--- lib/ansible/plugins/__init__.py | 4 +--- lib/ansible/plugins/action/__init__.py | 4 +--- lib/ansible/plugins/action/add_host.py | 4 +--- lib/ansible/plugins/action/assemble.py | 3 +-- lib/ansible/plugins/action/assert.py | 3 +-- lib/ansible/plugins/action/async_status.py | 3 +-- lib/ansible/plugins/action/command.py | 3 +-- lib/ansible/plugins/action/copy.py | 4 +--- lib/ansible/plugins/action/debug.py | 3 +-- lib/ansible/plugins/action/dnf.py | 1 + lib/ansible/plugins/action/fail.py | 3 +-- lib/ansible/plugins/action/fetch.py | 3 +-- lib/ansible/plugins/action/gather_facts.py | 3 +-- lib/ansible/plugins/action/group_by.py | 3 +-- lib/ansible/plugins/action/include_vars.py | 3 +-- lib/ansible/plugins/action/normal.py | 3 +-- lib/ansible/plugins/action/package.py | 3 +-- lib/ansible/plugins/action/pause.py | 3 +-- lib/ansible/plugins/action/raw.py | 3 +-- lib/ansible/plugins/action/reboot.py | 3 +-- lib/ansible/plugins/action/script.py | 3 +-- lib/ansible/plugins/action/service.py | 3 +-- lib/ansible/plugins/action/set_fact.py | 3 +-- lib/ansible/plugins/action/set_stats.py | 3 +-- lib/ansible/plugins/action/shell.py | 3 +-- lib/ansible/plugins/action/template.py | 3 +-- lib/ansible/plugins/action/unarchive.py | 3 +-- lib/ansible/plugins/action/uri.py | 4 +--- lib/ansible/plugins/action/validate_argument_spec.py | 3 +-- lib/ansible/plugins/action/wait_for_connection.py | 3 +-- lib/ansible/plugins/action/yum.py | 3 +-- lib/ansible/plugins/become/__init__.py | 3 +-- lib/ansible/plugins/become/runas.py | 3 +-- lib/ansible/plugins/become/su.py | 3 +-- lib/ansible/plugins/become/sudo.py | 3 +-- lib/ansible/plugins/cache/__init__.py | 3 +-- lib/ansible/plugins/cache/base.py | 3 +-- lib/ansible/plugins/cache/jsonfile.py | 4 +--- lib/ansible/plugins/cache/memory.py | 3 +-- lib/ansible/plugins/callback/__init__.py | 4 +--- lib/ansible/plugins/callback/default.py | 3 +-- lib/ansible/plugins/callback/junit.py | 3 +-- lib/ansible/plugins/callback/minimal.py | 4 +--- lib/ansible/plugins/callback/oneline.py | 4 +--- lib/ansible/plugins/callback/tree.py | 3 +-- lib/ansible/plugins/cliconf/__init__.py | 3 +-- lib/ansible/plugins/connection/__init__.py | 3 +-- lib/ansible/plugins/connection/local.py | 3 +-- lib/ansible/plugins/connection/paramiko_ssh.py | 3 +-- lib/ansible/plugins/connection/psrp.py | 3 +-- lib/ansible/plugins/connection/ssh.py | 3 +-- lib/ansible/plugins/connection/winrm.py | 3 +-- .../plugins/doc_fragments/action_common_attributes.py | 3 +-- lib/ansible/plugins/doc_fragments/action_core.py | 3 +-- lib/ansible/plugins/doc_fragments/backup.py | 3 +-- .../plugins/doc_fragments/connection_pipelining.py | 3 +-- lib/ansible/plugins/doc_fragments/constructed.py | 3 +-- lib/ansible/plugins/doc_fragments/decrypt.py | 3 +-- lib/ansible/plugins/doc_fragments/default_callback.py | 3 +-- lib/ansible/plugins/doc_fragments/files.py | 3 +-- lib/ansible/plugins/doc_fragments/inventory_cache.py | 3 +-- .../plugins/doc_fragments/result_format_callback.py | 3 +-- lib/ansible/plugins/doc_fragments/return_common.py | 3 +-- lib/ansible/plugins/doc_fragments/shell_common.py | 3 +-- lib/ansible/plugins/doc_fragments/shell_windows.py | 3 +-- lib/ansible/plugins/doc_fragments/template_common.py | 3 +-- lib/ansible/plugins/doc_fragments/url.py | 3 +-- lib/ansible/plugins/doc_fragments/url_windows.py | 3 +-- lib/ansible/plugins/doc_fragments/validate.py | 3 +-- .../plugins/doc_fragments/vars_plugin_staging.py | 3 +-- lib/ansible/plugins/filter/__init__.py | 3 +-- lib/ansible/plugins/filter/core.py | 4 +--- lib/ansible/plugins/filter/encryption.py | 4 +--- lib/ansible/plugins/filter/urls.py | 3 +-- lib/ansible/plugins/filter/urlsplit.py | 3 +-- lib/ansible/plugins/httpapi/__init__.py | 3 +-- lib/ansible/plugins/inventory/__init__.py | 4 +--- lib/ansible/plugins/inventory/advanced_host_list.py | 3 +-- lib/ansible/plugins/inventory/auto.py | 3 +-- lib/ansible/plugins/inventory/constructed.py | 3 +-- lib/ansible/plugins/inventory/generator.py | 3 +-- lib/ansible/plugins/inventory/host_list.py | 3 +-- lib/ansible/plugins/inventory/ini.py | 3 +-- lib/ansible/plugins/inventory/script.py | 3 +-- lib/ansible/plugins/inventory/toml.py | 3 +-- lib/ansible/plugins/inventory/yaml.py | 3 +-- lib/ansible/plugins/list.py | 3 +-- lib/ansible/plugins/loader.py | 3 +-- lib/ansible/plugins/lookup/__init__.py | 4 +--- lib/ansible/plugins/lookup/config.py | 3 +-- lib/ansible/plugins/lookup/csvfile.py | 3 +-- lib/ansible/plugins/lookup/dict.py | 3 +-- lib/ansible/plugins/lookup/env.py | 3 +-- lib/ansible/plugins/lookup/file.py | 3 +-- lib/ansible/plugins/lookup/fileglob.py | 3 +-- lib/ansible/plugins/lookup/first_found.py | 3 +-- lib/ansible/plugins/lookup/indexed_items.py | 3 +-- lib/ansible/plugins/lookup/ini.py | 3 +-- lib/ansible/plugins/lookup/inventory_hostnames.py | 3 +-- lib/ansible/plugins/lookup/items.py | 3 +-- lib/ansible/plugins/lookup/lines.py | 3 +-- lib/ansible/plugins/lookup/list.py | 4 +--- lib/ansible/plugins/lookup/nested.py | 3 +-- lib/ansible/plugins/lookup/password.py | 3 +-- lib/ansible/plugins/lookup/pipe.py | 3 +-- lib/ansible/plugins/lookup/random_choice.py | 3 +-- lib/ansible/plugins/lookup/sequence.py | 3 +-- lib/ansible/plugins/lookup/subelements.py | 3 +-- lib/ansible/plugins/lookup/template.py | 3 +-- lib/ansible/plugins/lookup/together.py | 3 +-- lib/ansible/plugins/lookup/unvault.py | 3 +-- lib/ansible/plugins/lookup/url.py | 3 +-- lib/ansible/plugins/lookup/varnames.py | 3 +-- lib/ansible/plugins/lookup/vars.py | 3 +-- lib/ansible/plugins/netconf/__init__.py | 3 +-- lib/ansible/plugins/shell/__init__.py | 3 +-- lib/ansible/plugins/shell/cmd.py | 3 +-- lib/ansible/plugins/shell/powershell.py | 3 +-- lib/ansible/plugins/shell/sh.py | 3 +-- lib/ansible/plugins/strategy/__init__.py | 4 +--- lib/ansible/plugins/strategy/debug.py | 3 +-- lib/ansible/plugins/strategy/free.py | 4 +--- lib/ansible/plugins/strategy/host_pinned.py | 4 +--- lib/ansible/plugins/strategy/linear.py | 4 +--- lib/ansible/plugins/terminal/__init__.py | 3 +-- lib/ansible/plugins/test/__init__.py | 3 +-- lib/ansible/plugins/test/core.py | 4 +--- lib/ansible/plugins/test/files.py | 4 +--- lib/ansible/plugins/test/mathstuff.py | 3 +-- lib/ansible/plugins/test/uri.py | 4 +--- lib/ansible/plugins/vars/__init__.py | 3 +-- lib/ansible/plugins/vars/host_group_vars.py | 3 +-- lib/ansible/release.py | 4 +--- lib/ansible/template/__init__.py | 4 +--- lib/ansible/template/native_helpers.py | 4 +--- lib/ansible/template/template.py | 4 +--- lib/ansible/template/vars.py | 1 + lib/ansible/utils/__init__.py | 4 +--- lib/ansible/utils/cmd_functions.py | 3 +-- lib/ansible/utils/collection_loader/__init__.py | 3 +-- .../utils/collection_loader/_collection_config.py | 3 +-- .../utils/collection_loader/_collection_finder.py | 3 +-- .../utils/collection_loader/_collection_meta.py | 3 +-- lib/ansible/utils/color.py | 3 +-- lib/ansible/utils/context_objects.py | 5 +---- lib/ansible/utils/encrypt.py | 3 +-- lib/ansible/utils/fqcn.py | 3 +-- lib/ansible/utils/galaxy.py | 4 +--- lib/ansible/utils/hashing.py | 4 +--- lib/ansible/utils/helpers.py | 4 +--- lib/ansible/utils/jsonrpc.py | 3 +-- lib/ansible/utils/listify.py | 4 +--- lib/ansible/utils/lock.py | 4 +--- lib/ansible/utils/multiprocessing.py | 4 +--- lib/ansible/utils/native_jinja.py | 4 +--- lib/ansible/utils/path.py | 3 +-- lib/ansible/utils/plugin_docs.py | 3 +-- lib/ansible/utils/py3compat.py | 4 +--- lib/ansible/utils/sentinel.py | 4 +--- lib/ansible/utils/shlex.py | 4 +--- lib/ansible/utils/singleton.py | 4 +--- lib/ansible/utils/ssh_functions.py | 4 +--- lib/ansible/utils/unicode.py | 4 +--- lib/ansible/utils/unsafe_proxy.py | 3 +-- lib/ansible/utils/vars.py | 4 +--- lib/ansible/utils/version.py | 4 +--- lib/ansible/vars/clean.py | 4 +--- lib/ansible/vars/fact_cache.py | 3 +-- lib/ansible/vars/hostvars.py | 4 +--- lib/ansible/vars/manager.py | 4 +--- lib/ansible/vars/reserved.py | 4 +--- setup.py | 3 +-- .../ansiballz_python/library/check_rlimit_and_maxfd.py | 3 +-- .../targets/ansiballz_python/library/custom_module.py | 3 +-- .../targets/ansiballz_python/library/sys_check.py | 3 +-- .../ansiballz_python/module_utils/custom_util.py | 3 +-- .../testns/testcol/plugins/cache/notjsonfile.py | 4 +--- .../testns/testcol/plugins/inventory/statichost.py | 3 +-- .../testns/testcol/plugins/lookup/noop.py | 4 +--- .../testns/testcol/plugins/modules/fakemodule.py | 3 +-- .../testns/testcol/plugins/modules/notrealmodule.py | 3 +-- .../testns/testcol/plugins/modules/randommodule.py | 3 +-- .../testns/testcol/plugins/vars/noop_vars_plugin.py | 3 +-- .../testns/testcol/plugins/cache/notjsonfile.py | 4 +--- .../testcol/plugins/filter/filter_subdir/in_subdir.py | 4 +--- .../testns/testcol/plugins/filter/grouped.py | 4 +--- .../testns/testcol/plugins/inventory/statichost.py | 3 +-- .../testns/testcol/plugins/lookup/noop.py | 4 +--- .../modules/database/database_type/subdir_module.py | 3 +-- .../testns/testcol/plugins/modules/fakemodule.py | 3 +-- .../testns/testcol/plugins/modules/notrealmodule.py | 3 +-- .../testns/testcol/plugins/modules/randommodule.py | 3 +-- .../testns/testcol/plugins/test/test_test.py | 3 +-- .../testns/testcol/plugins/vars/noop_vars_plugin.py | 3 +-- .../testcol2/plugins/doc_fragments/deprecation.py | 3 +-- .../testns/testcol2/plugins/doc_fragments/module.py | 3 +-- .../testns/testcol2/plugins/doc_fragments/plugin.py | 3 +-- .../testcol2/plugins/doc_fragments/version_added.py | 3 +-- .../testns/testcol3/plugins/modules/test1.py | 3 +-- .../testns/testcol4/plugins/modules/test2.py | 3 +-- .../targets/ansible-doc/filter_plugins/other.py | 4 +--- test/integration/targets/ansible-doc/fix-urls.py | 1 + .../targets/ansible-doc/library/double_doc.py | 3 +-- .../targets/ansible-doc/library/test_docs.py | 3 +-- .../library/test_docs_missing_description.py | 3 +-- .../ansible-doc/library/test_docs_no_metadata.py | 3 +-- .../targets/ansible-doc/library/test_docs_no_status.py | 3 +-- .../library/test_docs_non_iterable_status.py | 3 +-- .../library/test_docs_removed_precedence.py | 3 +-- .../ansible-doc/library/test_docs_removed_status.py | 3 +-- .../targets/ansible-doc/library/test_docs_returns.py | 3 +-- .../ansible-doc/library/test_docs_returns_broken.py | 3 +-- .../ansible-doc/library/test_docs_suboptions.py | 3 +-- .../ansible-doc/library/test_docs_yaml_anchors.py | 3 +-- .../targets/ansible-doc/library/test_no_docs.py | 3 +-- .../ansible-doc/library/test_no_docs_no_metadata.py | 3 +-- .../ansible-doc/library/test_no_docs_no_status.py | 3 +-- .../library/test_no_docs_non_iterable_status.py | 3 +-- .../lookup_plugins/_deprecated_with_adj_docs.py | 3 +-- .../lookup_plugins/_deprecated_with_docs.py | 3 +-- .../files/make_collection_dir.py | 2 ++ .../ansible-galaxy-collection/files/build_bad_tar.py | 3 +-- .../ansible-galaxy-collection/files/test_module.py | 3 +-- .../ansible-galaxy-collection/library/reset_pulp.py | 3 +-- .../library/setup_collections.py | 3 +-- .../ansible-galaxy-role/files/create-role-archive.py | 1 + .../targets/ansible-galaxy/files/testserver.py | 3 +-- .../targets/ansible-inventory/filter_plugins/toml.py | 4 +--- .../targets/ansible-runner/files/adhoc_example1.py | 3 +-- .../targets/ansible-runner/files/playbook_example1.py | 3 +-- .../targets/ansible-runner/filter_plugins/parse.py | 3 +-- .../col/tests/unit/plugins/module_utils/test_test.py | 3 +++ .../ns/col/plugins/module_utils/test.py | 2 ++ .../col/tests/unit/plugins/module_utils/test_test.py | 2 ++ .../ns/col/plugins/module_utils/test_util.py | 3 +-- .../ns/col/plugins/doc_fragments/ps_util.py | 3 +-- .../ns/col/plugins/module_utils/my_util.py | 3 +-- .../ns/col/plugins/modules/hello.py | 3 +-- .../tests/unit/plugins/module_utils/test_my_util.py | 3 +-- .../ns/col/tests/unit/plugins/modules/test_hello.py | 3 +-- .../targets/ansible-test-integration-targets/test.py | 1 + .../ns/col/plugins/module_utils/my_util.py | 3 +-- .../ns/col/plugins/modules/hello.py | 3 +-- .../ansible_collections/ns/col/run-with-pty.py | 1 + .../tests/integration/targets/no-tty/assert-no-tty.py | 1 + .../ansible_collections/ns/col/vendored_pty.py | 1 + .../ns/col/plugins/lookup/a/b/lookup2.py | 3 +-- .../ns/col/plugins/lookup/lookup1.py | 3 +-- .../ns/col/plugins/modules/a/b/module2.py | 3 +-- .../ns/col/plugins/modules/module1.py | 3 +-- .../ns/col/plugins/lookup/vendor1.py | 3 +-- .../ns/col/plugins/lookup/vendor2.py | 3 +-- .../ansible_collections/ns/col/do-not-check-me.py | 2 ++ .../ns/col/plugins/modules/check-me.py | 2 ++ .../ansible-test-sanity-no-get-exception/expected.txt | 4 ++-- .../ns/col/plugins/lookup/deprecated.py | 3 +-- .../targets/ansible-test-sanity-pylint/expected.txt | 2 +- .../ansible_collections/ns/col/do-not-check-me.py | 2 ++ .../ns/col/plugins/modules/check-me.py | 2 ++ .../ansible-test-sanity-replace-urlopen/expected.txt | 2 +- .../ansible_collections/ns/col/do-not-check-me.py | 2 ++ .../ns/col/plugins/modules/check-me.py | 2 ++ .../ansible-test-sanity-use-compat-six/expected.txt | 2 +- .../ns/col/plugins/modules/check_mode_attribute_1.py | 3 +-- .../ns/col/plugins/modules/check_mode_attribute_2.py | 3 +-- .../ns/col/plugins/modules/check_mode_attribute_3.py | 3 +-- .../ns/col/plugins/modules/check_mode_attribute_4.py | 3 +-- .../ns/col/plugins/modules/check_mode_attribute_5.py | 3 +-- .../ns/col/plugins/modules/check_mode_attribute_6.py | 3 +-- .../ns/col/plugins/modules/check_mode_attribute_7.py | 3 +-- .../ns/col/plugins/modules/import_order.py | 3 +-- .../ns/col/plugins/modules/invalid_yaml_syntax.py | 3 +-- .../ns/col/plugins/modules/no_callable.py | 3 +-- .../ns/col/plugins/modules/semantic_markup.py | 3 +-- .../ns/col/plugins/modules/sidecar.py | 1 + .../ansible-test-sanity-validate-modules/expected.txt | 8 ++++---- .../ansible_collections/ns/col/plugins/lookup/bad.py | 3 +-- .../ansible_collections/ns/col/plugins/lookup/world.py | 3 +-- .../ansible_collections/ns/col/plugins/modules/bad.py | 3 +-- .../ns/col/plugins/plugin_utils/check_pylint.py | 3 +-- .../ns/col/plugins/random_directory/bad.py | 3 +-- .../col/tests/integration/targets/hello/files/bad.py | 3 +-- .../col/tests/unit/plugins/modules/test_assertion.py | 3 +-- .../col/tests/unit/plugins/modules/test_constraints.py | 3 +-- .../tests/unit/plugins/modules/test_ansible_forked.py | 3 +-- .../ns/col/plugins/module_utils/my_util.py | 3 +-- .../ns/col/plugins/modules/hello.py | 3 +-- .../tests/unit/plugins/module_utils/test_my_util.py | 3 +-- .../ns/col/tests/unit/plugins/modules/test_hello.py | 3 +-- test/integration/targets/ansible-test/venv-pythons.py | 1 + test/integration/targets/ansible-vault/faux-editor.py | 3 +-- .../targets/ansible-vault/password-script.py | 3 +-- .../targets/ansible-vault/test-vault-client.py | 3 +-- .../targets/ansible/callback_plugins/callback_meta.py | 3 +-- test/integration/targets/argspec/library/argspec.py | 3 +-- test/integration/targets/async/library/async_test.py | 3 +-- .../targets/async_extra_data/library/junkping.py | 3 +-- .../targets/async_fail/action_plugins/normal.py | 3 +-- .../targets/async_fail/library/async_test.py | 3 +-- .../become_unprivileged/action_plugins/tmpdir.py | 4 +--- .../targets/builtin_vars_prompt/test-vars_prompt.py | 3 +-- test/integration/targets/cli/test-cli.py | 4 +--- test/integration/targets/cli/test_k_and_K.py | 4 +--- test/integration/targets/collection/update-ignore.py | 1 + .../duplicate/name/plugins/modules/ping.py | 2 ++ .../coll_in_sys/plugins/modules/systestmodule.py | 3 +-- .../testns/testcoll/plugins/modules/maskedmodule.py | 3 +-- .../testns/testcoll/plugins/modules/testmodule.py | 3 +-- .../ansible/builtin/plugins/modules/ping.py | 3 +-- .../ansible/bullcoll/plugins/modules/bullmodule.py | 3 +-- .../testns/testbroken/plugins/filter/broken_filter.py | 3 +-- .../roles/non_coll_role/library/embedded_module.py | 3 +-- .../plugins/action/action_subdir/subdir_ping_action.py | 3 +-- .../testns/testcoll/plugins/action/bypass_host_loop.py | 3 +-- .../testns/testcoll/plugins/action/plugin_lookup.py | 3 +-- .../testcoll/plugins/action/subclassed_normal.py | 3 +-- .../testcoll/plugins/action/uses_redirected_import.py | 3 +-- .../testns/testcoll/plugins/callback/usercallback.py | 3 +-- .../testns/testcoll/plugins/connection/localconn.py | 3 +-- .../testns/testcoll/plugins/doc_fragments/frag.py | 3 +-- .../plugins/filter/filter_subdir/my_subdir_filters.py | 3 +-- .../testns/testcoll/plugins/filter/myfilters.py | 3 +-- .../testns/testcoll/plugins/filter/myfilters2.py | 3 +-- .../plugins/lookup/lookup_subdir/my_subdir_lookup.py | 3 +-- .../testns/testcoll/plugins/lookup/mylookup.py | 3 +-- .../testns/testcoll/plugins/lookup/mylookup2.py | 3 +-- .../testns/testcoll/plugins/module_utils/base.py | 3 +-- .../testns/testcoll/plugins/module_utils/leaf.py | 3 +-- .../nested_same/nested_same/nested_same.py | 3 +-- .../testns/testcoll/plugins/module_utils/secondary.py | 3 +-- .../testcoll/plugins/module_utils/subpkg/submod.py | 3 +-- .../testcoll/plugins/module_utils/subpkg_with_init.py | 3 +-- .../plugins/module_utils/subpkg_with_init/__init__.py | 3 +-- .../subpkg_with_init/mod_in_subpkg_with_init.py | 3 +-- .../testns/testcoll/plugins/modules/deprecated_ping.py | 3 +-- .../modules/module_subdir/subdir_ping_module.py | 3 +-- .../testns/testcoll/plugins/modules/ping.py | 3 +-- .../testns/testcoll/plugins/modules/testmodule.py | 3 +-- .../plugins/modules/testmodule_bad_docfrags.py | 3 +-- .../modules/uses_base_mu_granular_nested_import.py | 3 +-- .../plugins/modules/uses_collection_redirected_mu.py | 3 +-- .../plugins/modules/uses_core_redirected_mu.py | 3 +-- .../plugins/modules/uses_leaf_mu_flat_import.py | 3 +-- .../plugins/modules/uses_leaf_mu_granular_import.py | 3 +-- .../plugins/modules/uses_leaf_mu_module_import_from.py | 3 +-- .../testns/testcoll/plugins/modules/uses_mu_missing.py | 3 +-- .../modules/uses_mu_missing_redirect_collection.py | 3 +-- .../plugins/modules/uses_mu_missing_redirect_module.py | 3 +-- .../plugins/modules/uses_nested_same_as_func.py | 3 +-- .../plugins/modules/uses_nested_same_as_module.py | 3 +-- .../testns/testcoll/plugins/test/mytests.py | 3 +-- .../testns/testcoll/plugins/test/mytests2.py | 3 +-- .../plugins/test/test_subdir/my_subdir_tests.py | 3 +-- .../testns/testcoll/plugins/vars/custom_vars.py | 3 +-- .../me/mycoll1/plugins/action/action1.py | 3 +-- .../me/mycoll1/plugins/modules/action1.py | 3 +-- .../me/mycoll2/plugins/modules/module1.py | 3 +-- .../content_adj/plugins/cache/custom_jsonfile.py | 4 +--- .../testns/content_adj/plugins/inventory/statichost.py | 3 +-- .../content_adj/plugins/module_utils/sub1/foomodule.py | 3 +-- .../content_adj/plugins/modules/contentadjmodule.py | 3 +-- .../testns/content_adj/plugins/vars/custom_adj_vars.py | 3 +-- .../collections/custom_vars_plugins/v1_vars_plugin.py | 3 +-- .../collections/custom_vars_plugins/v2_vars_plugin.py | 3 +-- .../override_formerly_core_masked_filter.py | 3 +-- test/integration/targets/collections/library/ping.py | 3 +-- .../test_plugins/override_formerly_core_masked_test.py | 3 +-- .../action_plugins/legacy_action.py | 3 +-- .../callback_plugins/display_resolved_action.py | 3 +-- .../test_coll/plugins/action/collection_action.py | 3 +-- .../test_coll/plugins/modules/collection_module.py | 3 +-- .../test_task_resolved_plugin/library/legacy_module.py | 3 +-- .../testcoll2/plugins/modules/testmodule2.py | 3 +-- .../my_ns/my_col/plugins/filter/test_filter.py | 3 +-- .../my_ns/my_col/plugins/lookup/lookup_name.py | 3 +-- .../plugins/lookup/lookup_no_future_boilerplate.py | 2 +- .../my_ns/my_col/plugins/test/test_test.py | 3 +-- .../my_ns/my_col/plugins/module_utils/my_util1.py | 3 +-- .../my_ns/my_col/plugins/module_utils/my_util2.py | 3 +-- .../my_ns/my_col/plugins/module_utils/my_util3.py | 3 +-- .../my_ns/my_col/plugins/modules/my_module.py | 3 +-- .../python/dist/plugins/modules/boo.py | 3 +-- .../python/dist/plugins/modules/boo.py | 3 +-- .../targets/common_network/test_plugins/is_mac.py | 3 +-- .../integration/targets/config/lookup_plugins/bogus.py | 4 +--- .../integration/targets/config/lookup_plugins/types.py | 4 +--- .../action_plugins/delegation_action.py | 3 +-- .../connection_plugins/delegation_connection.py | 3 +-- .../connection_plugins/remote_is_local.py | 3 +-- test/integration/targets/debugger/test_run_once.py | 1 + .../delegate_to/connection_plugins/fakelocal.py | 3 +-- .../targets/delegate_to/library/detect_interpreter.py | 3 +-- .../dict_transformations/library/convert_camelCase.py | 3 +-- .../dict_transformations/library/convert_snake_case.py | 3 +-- .../egg-info/lookup_plugins/import_pkg_resources.py | 3 +-- .../error_from_connection/connection_plugins/dummy.py | 3 +-- test/integration/targets/expect/files/test_command.py | 3 +-- .../targets/fetch/injection/library/slurp.py | 3 +-- .../fork_safe_stdio/callback_plugins/spewstdio.py | 2 ++ .../targets/fork_safe_stdio/run-with-pty.py | 1 + .../targets/fork_safe_stdio/vendored_pty.py | 1 + .../targets/gathering_facts/cache_plugins/none.py | 3 +-- .../cisco/ios/plugins/modules/ios_facts.py | 1 + .../targets/gathering_facts/library/file_utils.py | 3 +-- test/integration/targets/get_url/files/testserver.py | 3 +-- test/integration/targets/group/files/get_free_gid.py | 3 +-- .../targets/group/files/get_gid_for_group.py | 3 +-- .../ignore_unreachable/fake_connectors/bad_exec.py | 3 +-- .../ignore_unreachable/fake_connectors/bad_put_file.py | 3 +-- .../playbook/sub_playbook/library/helloworld.py | 3 +-- test/integration/targets/infra/library/test.py | 3 +-- .../library/test_echo_module.py | 3 +-- .../inventory_plugins/contructed_with_hostvars.py | 3 +-- .../inventory_cache/plugins/inventory/cache_host.py | 3 +-- .../plugins/inventory/exercise_cache.py | 3 +-- .../foo/bar/plugins/filter/bad_collection_filter.py | 4 +--- .../foo/bar/plugins/filter/bad_collection_filter2.py | 4 +--- .../foo/bar/plugins/filter/good_collection_filter.py | 4 +--- .../foo/bar/plugins/test/bad_collection_test.py | 4 +--- .../foo/bar/plugins/test/good_collection_test.py | 4 +--- .../targets/jinja_plugins/filter_plugins/bad_filter.py | 4 +--- .../jinja_plugins/filter_plugins/good_filter.py | 4 +--- .../targets/jinja_plugins/test_plugins/bad_test.py | 4 +--- .../targets/jinja_plugins/test_plugins/good_test.py | 4 +--- .../ns/name/plugins/connection/dummy.py | 1 + .../library/missing_required_lib.py | 3 +-- .../targets/module_defaults/action_plugins/debug.py | 3 +-- .../othercoll/plugins/action/other_echoaction.py | 3 +-- .../testns/othercoll/plugins/modules/other_echo1.py | 3 +-- .../testns/testcoll/plugins/action/echoaction.py | 3 +-- .../testns/testcoll/plugins/action/eos.py | 3 +-- .../testns/testcoll/plugins/action/ios.py | 3 +-- .../testns/testcoll/plugins/action/vyos.py | 3 +-- .../testns/testcoll/plugins/module_utils/echo_impl.py | 3 +-- .../testns/testcoll/plugins/modules/echo1.py | 3 +-- .../testns/testcoll/plugins/modules/echo2.py | 3 +-- .../testns/testcoll/plugins/modules/eosfacts.py | 3 +-- .../testns/testcoll/plugins/modules/ios_facts.py | 3 +-- .../testns/testcoll/plugins/modules/metadata.py | 3 +-- .../testns/testcoll/plugins/modules/module.py | 3 +-- .../testns/testcoll/plugins/modules/ping.py | 3 +-- .../testns/testcoll/plugins/modules/vyosfacts.py | 3 +-- .../targets/module_defaults/library/legacy_ping.py | 3 +-- .../module_defaults/library/test_module_defaults.py | 3 +-- .../targets/module_no_log/library/module_that_logs.py | 3 +-- .../targets/module_precedence/lib_with_extension/a.py | 3 +-- .../module_precedence/lib_with_extension/ping.py | 3 +-- .../multiple_roles/bar/library/ping.py | 3 +-- .../multiple_roles/foo/library/ping.py | 3 +-- .../roles_with_extension/foo/library/a.py | 3 +-- .../roles_with_extension/foo/library/ping.py | 3 +-- .../targets/module_utils/callback/pure_json.py | 3 +-- .../testns/testcoll/plugins/module_utils/legit.py | 3 +-- test/integration/targets/module_utils/library/test.py | 2 +- .../module_utils/library/test_alias_deprecation.py | 3 +-- .../targets/module_utils/library/test_cwd_missing.py | 3 +-- .../module_utils/library/test_cwd_unreadable.py | 3 +-- .../targets/module_utils/library/test_datetime.py | 3 +-- .../targets/module_utils/library/test_env_override.py | 3 +-- .../targets/module_utils/library/test_failure.py | 3 +-- .../library/test_heuristic_log_sanitize.py | 3 +-- .../targets/module_utils/library/test_network.py | 3 +-- .../targets/module_utils/library/test_no_log.py | 3 +-- .../targets/module_utils/library/test_optional.py | 3 +-- .../targets/module_utils/library/test_override.py | 3 +-- .../module_utils/library/test_recursive_diff.py | 3 +-- .../library/ansible_release.py | 3 +-- .../module_utils_common.respawn/library/respawnme.py | 3 +-- .../targets/module_utils_urls/library/test_peercert.py | 3 +-- test/integration/targets/no_log/library/module.py | 3 +-- .../plugins/cache/configurable_redis.py | 3 +-- .../plugins/cache/legacy_redis.py | 3 +-- .../old_style_cache_plugins/plugins/inventory/test.py | 3 +-- .../deprecation_warning/v2_vars_plugin.py | 3 +++ .../old_style_vars_plugins/deprecation_warning/vars.py | 2 ++ .../vars_plugins/auto_enabled.py | 2 ++ .../vars_plugins/implicitly_auto_enabled.py | 2 ++ .../vars_plugins/require_enabled.py | 2 ++ test/integration/targets/packaging_cli-doc/verify.py | 1 + test/integration/targets/pause/test-pause.py | 3 +-- .../pip/files/ansible_test_pip_chdir/__init__.py | 3 +-- test/integration/targets/pip/files/setup.py | 3 +-- .../lookup_plugins/check_pkg_resources.py | 3 +-- .../plugin_config_for_inventory/cache_plugins/none.py | 3 +-- .../plugin_config_for_inventory/test_inventory.py | 3 +-- .../normal/action_plugins/self_referential.py | 3 +-- .../plugin_loader/normal/library/_underscore.py | 3 +-- .../plugin_loader/override/filter_plugins/core.py | 4 +--- .../plugin_namespace/filter_plugins/test_filter.py | 3 +-- .../plugin_namespace/lookup_plugins/lookup_name.py | 3 +-- .../targets/plugin_namespace/test_plugins/test_test.py | 3 +-- .../prepare_http_tests/library/httptester_kinit.py | 3 +-- .../subdir/inventory_plugins/notyaml.py | 3 +-- .../action_plugins/result_pickle_error.py | 3 +-- test/integration/targets/run_modules/library/test.py | 3 +-- test/integration/targets/script/files/no_shebang.py | 3 +-- .../targets/service/files/ansible_test_service.py | 3 +-- .../service_facts/files/ansible_test_service.py | 3 +-- .../targets/setup_paramiko/library/detect_paramiko.py | 3 +-- .../targets/setup_rpm_repo/library/create_repo.py | 3 +-- .../targets/shell/action_plugins/test_shell.py | 4 +--- .../connection_plugins/test_connection_default.py | 3 +-- .../connection_plugins/test_connection_override.py | 3 +-- .../callback_plugins/callback_debug.py | 3 +-- .../template/role_filter/filter_plugins/myplugin.py | 3 +-- .../template_lookups/mock_lookup_plugins/77788.py | 2 ++ test/integration/targets/test_utils/scripts/timeout.py | 1 + test/integration/targets/throttle/test_throttle.py | 3 +-- .../action_plugins/unexpected.py | 2 ++ .../targets/until/action_plugins/shell_no_failed.py | 3 +-- test/integration/targets/uri/files/testserver.py | 3 +-- .../var_precedence/ansible-var-precedence-check.py | 3 +-- test/integration/targets/wait_for/files/testserver.py | 3 +-- test/integration/targets/wait_for/files/write_utf16.py | 3 +-- test/integration/targets/wait_for/files/zombie.py | 3 +-- .../want_json_modules_posix/library/helloworld.py | 3 +-- .../win_exec_wrapper/action_plugins/test_rc_1.py | 1 + .../filter_list_of_tuples_by_first_param.py | 3 +-- .../code-smell/ansible-test-future-boilerplate.json | 10 ---------- test/sanity/code-smell/future-boilerplate.json | 6 ++++++ ...est-future-boilerplate.py => future-boilerplate.py} | 3 +-- test/sanity/ignore.txt | 1 - test/support/integration/plugins/filter/json_query.py | 3 +-- test/support/integration/plugins/modules/htpasswd.py | 3 +-- test/support/integration/plugins/modules/pkgng.py | 3 +-- test/support/integration/plugins/modules/sefcontext.py | 3 +-- test/support/integration/plugins/modules/timezone.py | 3 +-- test/support/integration/plugins/modules/zypper.py | 3 +-- .../ansible/netcommon/plugins/action/cli_config.py | 3 +-- .../ansible/netcommon/plugins/action/net_get.py | 3 +-- .../ansible/netcommon/plugins/action/net_put.py | 3 +-- .../ansible/netcommon/plugins/action/network.py | 3 +-- .../netcommon/plugins/connection/network_cli.py | 3 +-- .../ansible/netcommon/plugins/connection/persistent.py | 3 +-- .../plugins/doc_fragments/connection_persistent.py | 4 +--- .../netcommon/plugins/module_utils/compat/ipaddress.py | 2 +- .../plugins/module_utils/network/common/cfg/base.py | 1 + .../plugins/module_utils/network/common/config.py | 2 ++ .../plugins/module_utils/network/common/facts/facts.py | 2 ++ .../plugins/module_utils/network/common/netconf.py | 2 ++ .../plugins/module_utils/network/common/network.py | 1 + .../plugins/module_utils/network/common/parsing.py | 1 + .../plugins/module_utils/network/common/utils.py | 1 + .../ansible/netcommon/plugins/modules/cli_config.py | 4 +--- .../netcommon/plugins/plugin_utils/connection_base.py | 3 +-- .../cisco/ios/plugins/action/ios.py | 3 +-- .../cisco/ios/plugins/cliconf/ios.py | 3 +-- .../cisco/ios/plugins/doc_fragments/ios.py | 1 + .../cisco/ios/plugins/module_utils/network/ios/ios.py | 2 ++ .../cisco/ios/plugins/modules/ios_command.py | 1 + .../cisco/ios/plugins/modules/ios_config.py | 1 + .../cisco/ios/plugins/terminal/ios.py | 3 +-- .../vyos/vyos/plugins/action/vyos.py | 3 +-- .../vyos/vyos/plugins/cliconf/vyos.py | 3 +-- .../vyos/vyos/plugins/doc_fragments/vyos.py | 1 + .../module_utils/network/vyos/argspec/facts/facts.py | 4 +--- .../vyos/argspec/firewall_rules/firewall_rules.py | 4 +--- .../network/vyos/argspec/interfaces/interfaces.py | 4 +--- .../vyos/argspec/l3_interfaces/l3_interfaces.py | 4 +--- .../vyos/argspec/lag_interfaces/lag_interfaces.py | 4 +--- .../network/vyos/argspec/lldp_global/lldp_global.py | 4 +--- .../vyos/argspec/lldp_interfaces/lldp_interfaces.py | 4 +--- .../vyos/argspec/static_routes/static_routes.py | 4 +--- .../vyos/config/lldp_interfaces/lldp_interfaces.py | 4 +--- .../plugins/module_utils/network/vyos/facts/facts.py | 3 +-- .../vyos/facts/firewall_rules/firewall_rules.py | 3 +-- .../network/vyos/facts/interfaces/interfaces.py | 4 +--- .../network/vyos/facts/l3_interfaces/l3_interfaces.py | 4 +--- .../vyos/facts/lag_interfaces/lag_interfaces.py | 3 +-- .../module_utils/network/vyos/facts/legacy/base.py | 3 +-- .../network/vyos/facts/lldp_global/lldp_global.py | 3 +-- .../vyos/facts/lldp_interfaces/lldp_interfaces.py | 4 +--- .../network/vyos/facts/static_routes/static_routes.py | 3 +-- .../plugins/module_utils/network/vyos/utils/utils.py | 3 +-- .../vyos/plugins/module_utils/network/vyos/vyos.py | 2 ++ .../vyos/vyos/plugins/modules/vyos_command.py | 1 + .../vyos/vyos/plugins/modules/vyos_config.py | 1 + .../vyos/vyos/plugins/modules/vyos_facts.py | 1 + .../vyos/vyos/plugins/modules/vyos_lldp_interfaces.py | 3 +-- .../vyos/vyos/plugins/terminal/vyos.py | 3 +-- .../ansible/windows/plugins/action/win_reboot.py | 3 +-- .../ansible/windows/plugins/plugin_utils/_quote.py | 3 +-- .../ansible/windows/plugins/plugin_utils/_reboot.py | 1 + .../windows-integration/plugins/action/win_copy.py | 4 +--- .../windows-integration/plugins/action/win_reboot.py | 3 +-- .../windows-integration/plugins/action/win_template.py | 4 +--- .../windows-integration/plugins/become/runas.py | 3 +-- test/units/_vendor/test_vendor.py | 1 + test/units/ansible_test/ci/test_azp.py | 3 +-- test/units/ansible_test/ci/util.py | 3 +-- test/units/ansible_test/conftest.py | 3 +-- test/units/cli/arguments/test_optparse_helpers.py | 3 +-- test/units/cli/galaxy/test_collection_extract_tar.py | 3 +-- test/units/cli/galaxy/test_display_collection.py | 3 +-- test/units/cli/galaxy/test_display_header.py | 3 +-- test/units/cli/galaxy/test_display_role.py | 3 +-- test/units/cli/galaxy/test_execute_list.py | 3 +-- test/units/cli/galaxy/test_execute_list_collection.py | 3 +-- test/units/cli/galaxy/test_get_collection_widths.py | 3 +-- test/units/cli/test_adhoc.py | 3 +-- test/units/cli/test_cli.py | 4 +--- test/units/cli/test_console.py | 4 +--- test/units/cli/test_doc.py | 4 +--- test/units/cli/test_galaxy.py | 4 +--- test/units/cli/test_playbook.py | 4 +--- test/units/cli/test_vault.py | 4 +--- test/units/compat/mock.py | 3 +-- test/units/compat/unittest.py | 4 +--- test/units/config/manager/test_find_ini_config_file.py | 4 +--- test/units/config/test_manager.py | 4 +--- test/units/errors/test_errors.py | 4 +--- test/units/executor/module_common/conftest.py | 2 ++ .../units/executor/module_common/test_modify_module.py | 3 +-- .../units/executor/module_common/test_module_common.py | 4 +--- .../executor/module_common/test_recursive_finder.py | 4 +--- test/units/executor/test_interpreter_discovery.py | 4 +--- test/units/executor/test_play_iterator.py | 4 +--- test/units/executor/test_playbook_executor.py | 4 +--- test/units/executor/test_task_executor.py | 4 +--- .../executor/test_task_queue_manager_callbacks.py | 5 +---- test/units/executor/test_task_result.py | 4 +--- test/units/galaxy/test_api.py | 4 +--- test/units/galaxy/test_collection.py | 4 +--- test/units/galaxy/test_collection_install.py | 4 +--- test/units/galaxy/test_role_install.py | 4 +--- test/units/galaxy/test_role_requirements.py | 4 +--- test/units/galaxy/test_token.py | 4 +--- test/units/galaxy/test_user_agent.py | 3 +-- test/units/inventory/test_group.py | 3 +-- test/units/inventory/test_host.py | 3 +-- test/units/mock/loader.py | 4 +--- test/units/mock/path.py | 3 +-- test/units/mock/procenv.py | 4 +--- test/units/mock/vault_helper.py | 4 +--- test/units/mock/yaml_helper.py | 3 +-- test/units/module_utils/basic/test__log_invocation.py | 3 +-- .../module_utils/basic/test__symbolic_mode_to_octal.py | 4 +--- test/units/module_utils/basic/test_argument_spec.py | 3 +-- test/units/module_utils/basic/test_atomic_move.py | 3 +-- .../module_utils/basic/test_command_nonexisting.py | 3 +-- test/units/module_utils/basic/test_deprecate_warn.py | 3 +-- test/units/module_utils/basic/test_dict_converters.py | 3 +-- test/units/module_utils/basic/test_exit_json.py | 4 +--- test/units/module_utils/basic/test_filesystem.py | 3 +-- .../basic/test_get_available_hash_algorithms.py | 3 +-- .../module_utils/basic/test_get_file_attributes.py | 4 +--- test/units/module_utils/basic/test_get_module_path.py | 3 +-- .../module_utils/basic/test_heuristic_log_sanitize.py | 4 +--- test/units/module_utils/basic/test_imports.py | 3 +-- test/units/module_utils/basic/test_log.py | 3 +-- test/units/module_utils/basic/test_no_log.py | 3 +-- .../module_utils/basic/test_platform_distribution.py | 3 +-- test/units/module_utils/basic/test_run_command.py | 4 +--- test/units/module_utils/basic/test_safe_eval.py | 4 +--- test/units/module_utils/basic/test_sanitize_keys.py | 4 +--- test/units/module_utils/basic/test_selinux.py | 3 +-- test/units/module_utils/basic/test_set_cwd.py | 4 +--- .../module_utils/basic/test_set_mode_if_different.py | 4 +--- test/units/module_utils/basic/test_tmpdir.py | 4 +--- .../units/module_utils/common/arg_spec/test_aliases.py | 3 +-- .../common/arg_spec/test_module_validate.py | 3 +-- .../module_utils/common/arg_spec/test_sub_spec.py | 3 +-- .../common/arg_spec/test_validate_invalid.py | 3 +-- .../common/arg_spec/test_validate_valid.py | 3 +-- .../common/parameters/test_check_arguments.py | 3 +-- .../common/parameters/test_handle_aliases.py | 3 +-- .../common/parameters/test_list_deprecations.py | 3 +-- .../common/parameters/test_list_no_log_values.py | 3 +-- .../module_utils/common/process/test_get_bin_path.py | 3 +-- test/units/module_utils/common/test_collections.py | 3 +-- .../module_utils/common/test_dict_transformations.py | 3 +-- test/units/module_utils/common/test_locale.py | 3 +-- test/units/module_utils/common/test_network.py | 4 +--- test/units/module_utils/common/test_sys_info.py | 3 +-- test/units/module_utils/common/test_utils.py | 3 +-- .../common/text/converters/test_container_to_bytes.py | 3 +-- .../common/text/converters/test_container_to_text.py | 3 +-- .../text/converters/test_json_encode_fallback.py | 3 +-- .../common/text/converters/test_jsonify.py | 3 +-- .../module_utils/common/text/converters/test_to_str.py | 3 +-- .../common/text/formatters/test_bytes_to_human.py | 3 +-- .../common/text/formatters/test_human_to_bytes.py | 3 +-- .../common/text/formatters/test_lenient_lowercase.py | 3 +-- .../common/validation/test_check_missing_parameters.py | 3 +-- .../common/validation/test_check_mutually_exclusive.py | 3 +-- .../common/validation/test_check_required_arguments.py | 3 +-- .../common/validation/test_check_required_by.py | 3 +-- .../common/validation/test_check_required_if.py | 3 +-- .../common/validation/test_check_required_one_of.py | 3 +-- .../common/validation/test_check_required_together.py | 3 +-- .../common/validation/test_check_type_bits.py | 3 +-- .../common/validation/test_check_type_bool.py | 3 +-- .../common/validation/test_check_type_bytes.py | 3 +-- .../common/validation/test_check_type_dict.py | 3 +-- .../common/validation/test_check_type_float.py | 3 +-- .../common/validation/test_check_type_int.py | 3 +-- .../common/validation/test_check_type_jsonarg.py | 3 +-- .../common/validation/test_check_type_list.py | 3 +-- .../common/validation/test_check_type_path.py | 3 +-- .../common/validation/test_check_type_raw.py | 3 +-- .../common/validation/test_check_type_str.py | 3 +-- .../module_utils/common/validation/test_count_terms.py | 3 +-- .../module_utils/common/warnings/test_deprecate.py | 3 +-- test/units/module_utils/common/warnings/test_warn.py | 3 +-- test/units/module_utils/compat/test_datetime.py | 3 +-- test/units/module_utils/conftest.py | 3 +-- test/units/module_utils/facts/base.py | 4 +--- test/units/module_utils/facts/hardware/aix_data.py | 3 +-- test/units/module_utils/facts/hardware/linux_data.py | 3 +-- .../module_utils/facts/hardware/test_aix_processor.py | 3 +-- test/units/module_utils/facts/hardware/test_linux.py | 3 +-- .../facts/hardware/test_linux_get_cpu_info.py | 3 +-- .../facts/hardware/test_sunos_get_uptime_facts.py | 3 +-- test/units/module_utils/facts/network/test_fc_wwn.py | 3 +-- .../module_utils/facts/network/test_generic_bsd.py | 4 +--- .../facts/network/test_iscsi_get_initiator.py | 3 +-- .../facts/network/test_locally_reachable_ips.py | 4 +--- test/units/module_utils/facts/other/test_facter.py | 4 +--- test/units/module_utils/facts/other/test_ohai.py | 4 +--- .../module_utils/facts/system/distribution/conftest.py | 3 +-- .../system/distribution/test_distribution_sles4sap.py | 3 +-- .../system/distribution/test_distribution_version.py | 3 +-- .../test_parse_distribution_file_ClearLinux.py | 3 +-- .../test_parse_distribution_file_Slackware.py | 3 +-- test/units/module_utils/facts/system/test_cmdline.py | 3 +-- test/units/module_utils/facts/system/test_lsb.py | 4 +--- test/units/module_utils/facts/system/test_pkg_mgr.py | 3 +-- test/units/module_utils/facts/system/test_user.py | 4 +--- .../units/module_utils/facts/test_ansible_collector.py | 4 +--- test/units/module_utils/facts/test_collector.py | 4 +--- test/units/module_utils/facts/test_collectors.py | 4 +--- test/units/module_utils/facts/test_date_time.py | 3 +-- test/units/module_utils/facts/test_facts.py | 4 +--- test/units/module_utils/facts/test_sysctl.py | 4 +--- test/units/module_utils/facts/test_timeout.py | 4 +--- test/units/module_utils/facts/test_utils.py | 4 +--- test/units/module_utils/facts/virtual/test_linux.py | 3 +-- .../json_utils/test_filter_non_json_lines.py | 4 +--- test/units/module_utils/parsing/test_convert_bool.py | 4 +--- test/units/module_utils/test_api.py | 3 +-- test/units/module_utils/test_connection.py | 3 +-- test/units/module_utils/test_distro.py | 3 +-- test/units/module_utils/test_text.py | 3 +-- .../module_utils/urls/test_RedirectHandlerFactory.py | 3 +-- test/units/module_utils/urls/test_Request.py | 3 +-- test/units/module_utils/urls/test_RequestWithMethod.py | 3 +-- test/units/module_utils/urls/test_channel_binding.py | 3 +-- test/units/module_utils/urls/test_fetch_file.py | 3 +-- test/units/module_utils/urls/test_fetch_url.py | 3 +-- test/units/module_utils/urls/test_generic_urlparse.py | 3 +-- test/units/module_utils/urls/test_gzip.py | 3 +-- test/units/module_utils/urls/test_prepare_multipart.py | 3 +-- test/units/module_utils/urls/test_split.py | 3 +-- test/units/module_utils/urls/test_urls.py | 3 +-- test/units/modules/conftest.py | 3 +-- test/units/modules/test_apt.py | 3 +-- test/units/modules/test_apt_key.py | 3 +-- test/units/modules/test_async_wrapper.py | 3 +-- test/units/modules/test_copy.py | 4 +--- test/units/modules/test_hostname.py | 3 +-- test/units/modules/test_iptables.py | 3 +-- test/units/modules/test_known_hosts.py | 3 +-- test/units/modules/test_pip.py | 3 +-- test/units/modules/test_service.py | 3 +-- test/units/modules/test_service_facts.py | 3 +-- test/units/modules/test_systemd.py | 3 +-- test/units/modules/test_unarchive.py | 4 +--- test/units/modules/test_yum.py | 3 +-- test/units/modules/utils.py | 3 +-- test/units/parsing/test_ajson.py | 3 +-- test/units/parsing/test_dataloader.py | 4 +--- test/units/parsing/test_mod_args.py | 3 +-- test/units/parsing/test_splitter.py | 4 +--- test/units/parsing/test_unquote.py | 4 +--- test/units/parsing/utils/test_addresses.py | 3 +-- test/units/parsing/utils/test_jsonify.py | 3 +-- test/units/parsing/utils/test_yaml.py | 3 +-- test/units/parsing/vault/test_vault.py | 4 +--- test/units/parsing/vault/test_vault_editor.py | 4 +--- test/units/parsing/yaml/test_constructor.py | 3 +-- test/units/parsing/yaml/test_dumper.py | 4 +--- test/units/parsing/yaml/test_loader.py | 4 +--- test/units/parsing/yaml/test_objects.py | 4 +--- test/units/playbook/role/test_include_role.py | 4 +--- test/units/playbook/role/test_role.py | 4 +--- test/units/playbook/test_attribute.py | 3 +-- test/units/playbook/test_base.py | 4 +--- test/units/playbook/test_block.py | 4 +--- test/units/playbook/test_collectionsearch.py | 3 +-- test/units/playbook/test_conditional.py | 3 +-- test/units/playbook/test_helpers.py | 4 +--- test/units/playbook/test_included_file.py | 4 +--- test/units/playbook/test_play.py | 4 +--- test/units/playbook/test_play_context.py | 4 +--- test/units/playbook/test_playbook.py | 4 +--- test/units/playbook/test_taggable.py | 4 +--- test/units/playbook/test_task.py | 4 +--- test/units/plugins/action/test_action.py | 4 +--- test/units/plugins/action/test_gather_facts.py | 3 +-- test/units/plugins/action/test_raw.py | 3 +-- test/units/plugins/action/test_reboot.py | 2 ++ test/units/plugins/become/conftest.py | 4 +--- test/units/plugins/become/test_su.py | 4 +--- test/units/plugins/become/test_sudo.py | 4 +--- test/units/plugins/cache/test_cache.py | 4 +--- test/units/plugins/callback/test_callback.py | 4 +--- test/units/plugins/connection/test_connection.py | 4 +--- test/units/plugins/connection/test_local.py | 4 +--- test/units/plugins/connection/test_paramiko_ssh.py | 4 +--- test/units/plugins/connection/test_psrp.py | 4 +--- test/units/plugins/connection/test_ssh.py | 4 +--- test/units/plugins/connection/test_winrm.py | 4 +--- test/units/plugins/filter/test_core.py | 3 +-- test/units/plugins/inventory/test_constructed.py | 3 +-- test/units/plugins/inventory/test_inventory.py | 4 +--- test/units/plugins/inventory/test_script.py | 4 +--- test/units/plugins/loader_fixtures/import_fixture.py | 3 +-- test/units/plugins/lookup/test_env.py | 4 +--- test/units/plugins/lookup/test_ini.py | 4 +--- test/units/plugins/lookup/test_password.py | 4 +--- test/units/plugins/lookup/test_url.py | 3 +-- test/units/plugins/shell/test_cmd.py | 3 +-- test/units/plugins/shell/test_powershell.py | 3 +-- test/units/plugins/strategy/test_linear.py | 4 +--- test/units/plugins/test_plugins.py | 4 +--- test/units/regex/test_invalid_var_names.py | 4 +--- test/units/template/test_native_concat.py | 4 +--- test/units/template/test_templar.py | 4 +--- test/units/template/test_template_utilities.py | 4 +--- test/units/template/test_vars.py | 4 +--- test/units/test_context.py | 4 +--- test/units/test_no_tty.py | 2 ++ .../ansible/builtin/plugins/modules/shouldnotload.py | 3 +-- .../testns/testcoll/plugins/action/my_action.py | 3 +-- .../testcoll/plugins/module_utils/my_other_util.py | 3 +-- .../testns/testcoll/plugins/module_utils/my_util.py | 2 +- .../testns/testcoll/plugins/modules/__init__.py | 3 +-- .../testns/testcoll/plugins/modules/amodule.py | 3 +-- .../collections_masked/ansible_collections/__init__.py | 3 +-- .../ansible_collections/ansible/__init__.py | 3 +-- .../ansible_collections/testns/__init__.py | 3 +-- .../ansible_collections/testns/testcoll/__init__.py | 3 +-- .../utils/collection_loader/test_collection_loader.py | 3 +-- test/units/utils/display/test_broken_cowsay.py | 4 +--- test/units/utils/display/test_curses.py | 3 +-- test/units/utils/display/test_display.py | 3 +-- test/units/utils/display/test_logger.py | 3 +-- test/units/utils/display/test_warning.py | 3 +-- test/units/utils/test_cleanup_tmp_file.py | 3 +-- test/units/utils/test_context_objects.py | 3 +-- test/units/utils/test_display.py | 3 +-- test/units/utils/test_encrypt.py | 3 +-- test/units/utils/test_helpers.py | 3 +-- test/units/utils/test_isidentifier.py | 4 +--- test/units/utils/test_plugin_docs.py | 3 +-- test/units/utils/test_shlex.py | 3 +-- test/units/utils/test_unsafe_proxy.py | 3 +-- test/units/utils/test_vars.py | 4 +--- test/units/utils/test_version.py | 3 +-- test/units/vars/test_module_response_deepcopy.py | 3 +-- test/units/vars/test_variable_manager.py | 4 +--- 1151 files changed, 1193 insertions(+), 2426 deletions(-) delete mode 100644 test/sanity/code-smell/ansible-test-future-boilerplate.json create mode 100644 test/sanity/code-smell/future-boilerplate.json rename test/sanity/code-smell/{ansible-test-future-boilerplate.py => future-boilerplate.py} (87%) diff --git a/.azure-pipelines/scripts/combine-coverage.py b/.azure-pipelines/scripts/combine-coverage.py index 506ade6460c..10d83580c5e 100755 --- a/.azure-pipelines/scripts/combine-coverage.py +++ b/.azure-pipelines/scripts/combine-coverage.py @@ -7,8 +7,7 @@ Keep in mind that Azure Pipelines does not enforce unique job display names (onl It is up to pipeline authors to avoid name collisions when deviating from the recommended format. """ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import re diff --git a/.azure-pipelines/scripts/publish-codecov.py b/.azure-pipelines/scripts/publish-codecov.py index f2bc4b84b38..41f30af76d4 100755 --- a/.azure-pipelines/scripts/publish-codecov.py +++ b/.azure-pipelines/scripts/publish-codecov.py @@ -4,6 +4,7 @@ Upload code coverage reports to codecov.io. Multiple coverage files from multiple languages are accepted and aggregated after upload. Python coverage, as well as PowerShell and Python stubs can all be uploaded. """ +from __future__ import annotations import argparse import dataclasses diff --git a/.azure-pipelines/scripts/time-command.py b/.azure-pipelines/scripts/time-command.py index 5e8eb8d4c8f..c6b505006ec 100755 --- a/.azure-pipelines/scripts/time-command.py +++ b/.azure-pipelines/scripts/time-command.py @@ -1,8 +1,7 @@ #!/usr/bin/env python """Prepends a relative timestamp to each input line from stdin and writes it to stdout.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys import time diff --git a/hacking/azp/download.py b/hacking/azp/download.py index e0de99a27aa..47ebf39b11d 100755 --- a/hacking/azp/download.py +++ b/hacking/azp/download.py @@ -19,8 +19,7 @@ # along with Ansible. If not, see . """CLI tool for downloading results from Azure Pipelines CI runs.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # noinspection PyCompatibility import argparse diff --git a/hacking/azp/get_recent_coverage_runs.py b/hacking/azp/get_recent_coverage_runs.py index 1be867da1e4..b479179e711 100755 --- a/hacking/azp/get_recent_coverage_runs.py +++ b/hacking/azp/get_recent_coverage_runs.py @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.utils.color import stringc import requests diff --git a/hacking/azp/incidental.py b/hacking/azp/incidental.py index 87d4d213c94..5fc83e3d1ad 100755 --- a/hacking/azp/incidental.py +++ b/hacking/azp/incidental.py @@ -18,8 +18,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . """CLI tool for reporting on incidental test coverage.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # noinspection PyCompatibility import argparse diff --git a/hacking/azp/run.py b/hacking/azp/run.py index 00a177944f8..c5e248beb3b 100755 --- a/hacking/azp/run.py +++ b/hacking/azp/run.py @@ -20,8 +20,7 @@ """CLI tool for starting new CI runs.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # noinspection PyCompatibility import argparse diff --git a/hacking/backport/backport_of_line_adder.py b/hacking/backport/backport_of_line_adder.py index ef77ddcf400..9856b9f0e01 100755 --- a/hacking/backport/backport_of_line_adder.py +++ b/hacking/backport/backport_of_line_adder.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from github.PullRequest import PullRequest from github import Github diff --git a/hacking/report.py b/hacking/report.py index 58b3a6b915a..f968c41aa11 100755 --- a/hacking/report.py +++ b/hacking/report.py @@ -2,8 +2,7 @@ # PYTHON_ARGCOMPLETE_OK """A tool to aggregate data about Ansible source and testing into a sqlite DB for reporting.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import argparse import json diff --git a/hacking/return_skeleton_generator.py b/hacking/return_skeleton_generator.py index 7002b7899d5..875b5f06501 100755 --- a/hacking/return_skeleton_generator.py +++ b/hacking/return_skeleton_generator.py @@ -26,8 +26,7 @@ # You will likely want to adjust this to remove sensitive data or # ensure the `returns` value is correct, and to write a useful description -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections import OrderedDict import json diff --git a/hacking/test-module.py b/hacking/test-module.py index 7a329b4b2df..7b39798de5b 100755 --- a/hacking/test-module.py +++ b/hacking/test-module.py @@ -28,8 +28,7 @@ # ./hacking/test-module.py -m lib/ansible/modules/lineinfile.py -a "dest=/etc/exports line='/srv/home hostname1(rw,sync)'" --check # ./hacking/test-module.py -m lib/ansible/modules/command.py -a "echo hello" -n -o "test_hello" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import glob import optparse diff --git a/hacking/tests/gen_distribution_version_testcase.py b/hacking/tests/gen_distribution_version_testcase.py index e75c78ad919..57903180c11 100755 --- a/hacking/tests/gen_distribution_version_testcase.py +++ b/hacking/tests/gen_distribution_version_testcase.py @@ -9,8 +9,7 @@ and the current ansible_facts regarding the distribution version. This assumes a working ansible version in the path. """ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import os.path diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py index e4905a18532..2ded3913f51 100644 --- a/lib/ansible/__init__.py +++ b/lib/ansible/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # make vendored top-level modules accessible EARLY import ansible._vendor diff --git a/lib/ansible/__main__.py b/lib/ansible/__main__.py index 5a753ec05c7..cb7006285b4 100644 --- a/lib/ansible/__main__.py +++ b/lib/ansible/__main__.py @@ -1,5 +1,6 @@ # Copyright: (c) 2021, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations import argparse import importlib diff --git a/lib/ansible/_vendor/__init__.py b/lib/ansible/_vendor/__init__.py index a31957b6724..405d8def78e 100644 --- a/lib/ansible/_vendor/__init__.py +++ b/lib/ansible/_vendor/__init__.py @@ -1,8 +1,7 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import pkgutil diff --git a/lib/ansible/cli/__init__.py b/lib/ansible/cli/__init__.py index 91d6a969618..5cddbed6144 100644 --- a/lib/ansible/cli/__init__.py +++ b/lib/ansible/cli/__init__.py @@ -3,9 +3,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import locale import os diff --git a/lib/ansible/cli/adhoc.py b/lib/ansible/cli/adhoc.py index a54dacb70c2..efe99b99105 100755 --- a/lib/ansible/cli/adhoc.py +++ b/lib/ansible/cli/adhoc.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # ansible.cli needs to be imported first, to ensure the source bin/* scripts run that code first from ansible.cli import CLI diff --git a/lib/ansible/cli/arguments/__init__.py b/lib/ansible/cli/arguments/__init__.py index 7398e33fa30..47b93f9822b 100644 --- a/lib/ansible/cli/arguments/__init__.py +++ b/lib/ansible/cli/arguments/__init__.py @@ -1,5 +1,4 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations diff --git a/lib/ansible/cli/arguments/option_helpers.py b/lib/ansible/cli/arguments/option_helpers.py index 3baaf255cc3..daa7a9a9b2f 100644 --- a/lib/ansible/cli/arguments/option_helpers.py +++ b/lib/ansible/cli/arguments/option_helpers.py @@ -1,8 +1,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import copy import operator diff --git a/lib/ansible/cli/config.py b/lib/ansible/cli/config.py index 9c9d47b36ff..c2124e210ae 100755 --- a/lib/ansible/cli/config.py +++ b/lib/ansible/cli/config.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # ansible.cli needs to be imported first, to ensure the source bin/* scripts run that code first from ansible.cli import CLI diff --git a/lib/ansible/cli/console.py b/lib/ansible/cli/console.py index 2325bf05d6d..5805b97fce8 100755 --- a/lib/ansible/cli/console.py +++ b/lib/ansible/cli/console.py @@ -5,8 +5,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # ansible.cli needs to be imported first, to ensure the source bin/* scripts run that code first from ansible.cli import CLI diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py index d14832f58ea..f806837ef0a 100755 --- a/lib/ansible/cli/doc.py +++ b/lib/ansible/cli/doc.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # ansible.cli needs to be imported first, to ensure the source bin/* scripts run that code first from ansible.cli import CLI diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py index 65dd8aa4ff6..0366636c39c 100755 --- a/lib/ansible/cli/galaxy.py +++ b/lib/ansible/cli/galaxy.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # ansible.cli needs to be imported first, to ensure the source bin/* scripts run that code first from ansible.cli import CLI diff --git a/lib/ansible/cli/inventory.py b/lib/ansible/cli/inventory.py index 3550079bf8e..cfb5e306bd3 100755 --- a/lib/ansible/cli/inventory.py +++ b/lib/ansible/cli/inventory.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # ansible.cli needs to be imported first, to ensure the source bin/* scripts run that code first from ansible.cli import CLI diff --git a/lib/ansible/cli/playbook.py b/lib/ansible/cli/playbook.py index e63785b0587..1a3542de1c2 100755 --- a/lib/ansible/cli/playbook.py +++ b/lib/ansible/cli/playbook.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # ansible.cli needs to be imported first, to ensure the source bin/* scripts run that code first from ansible.cli import CLI diff --git a/lib/ansible/cli/pull.py b/lib/ansible/cli/pull.py index 15a3ee4366f..695cc266a31 100755 --- a/lib/ansible/cli/pull.py +++ b/lib/ansible/cli/pull.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # ansible.cli needs to be imported first, to ensure the source bin/* scripts run that code first from ansible.cli import CLI diff --git a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py index b1ed18c9c69..9455b9851a9 100755 --- a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py +++ b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py @@ -1,10 +1,7 @@ #!/usr/bin/env python # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) - -__metaclass__ = type - +from __future__ import annotations import fcntl import hashlib diff --git a/lib/ansible/cli/vault.py b/lib/ansible/cli/vault.py index cf2c9dd901e..86902a695fd 100755 --- a/lib/ansible/cli/vault.py +++ b/lib/ansible/cli/vault.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # ansible.cli needs to be imported first, to ensure the source bin/* scripts run that code first from ansible.cli import CLI diff --git a/lib/ansible/collections/list.py b/lib/ansible/collections/list.py index ef858ae999c..473c56d0945 100644 --- a/lib/ansible/collections/list.py +++ b/lib/ansible/collections/list.py @@ -1,5 +1,6 @@ # (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations from ansible.errors import AnsibleError from ansible.cli.galaxy import with_collection_artifacts_manager diff --git a/lib/ansible/compat/__init__.py b/lib/ansible/compat/__init__.py index 2990c6f54c2..9977603e9d0 100644 --- a/lib/ansible/compat/__init__.py +++ b/lib/ansible/compat/__init__.py @@ -15,12 +15,9 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - ''' Compat library for ansible. This contains compatibility definitions for older python When we need to import a module differently depending on python version, do it here. Then in the code we can simply import from compat in order to get what we want. ''' +from __future__ import annotations diff --git a/lib/ansible/compat/importlib_resources.py b/lib/ansible/compat/importlib_resources.py index ed104d6c5d0..0df95f0a518 100644 --- a/lib/ansible/compat/importlib_resources.py +++ b/lib/ansible/compat/importlib_resources.py @@ -1,8 +1,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/lib/ansible/compat/selectors/__init__.py b/lib/ansible/compat/selectors/__init__.py index a7b260e348a..6998c2ead40 100644 --- a/lib/ansible/compat/selectors/__init__.py +++ b/lib/ansible/compat/selectors/__init__.py @@ -15,10 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - # NOT_BUNDLED ''' @@ -27,6 +23,8 @@ package exists on pypi to backport the functionality as far as python-2.6. Implementation previously resided here - maintaining this file after the move to ansible.module_utils for code backwards compatibility. ''' +from __future__ import annotations + import sys from ansible.module_utils.compat import selectors sys.modules['ansible.compat.selectors'] = selectors diff --git a/lib/ansible/config/manager.py b/lib/ansible/config/manager.py index 418528aefa6..0050efd1ce0 100644 --- a/lib/ansible/config/manager.py +++ b/lib/ansible/config/manager.py @@ -1,8 +1,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import atexit import configparser diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 514357b0bc0..3bf952f271a 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/context.py b/lib/ansible/context.py index 216c135e5d3..4b4ed84e13a 100644 --- a/lib/ansible/context.py +++ b/lib/ansible/context.py @@ -1,10 +1,6 @@ # Copyright: (c) 2018, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - """ Context of the running Ansible. @@ -14,6 +10,7 @@ running the ansible command line tools. These APIs are still in flux so do not use them unless you are willing to update them with every Ansible release """ +from __future__ import annotations from collections.abc import Mapping, Set diff --git a/lib/ansible/errors/__init__.py b/lib/ansible/errors/__init__.py index a10be9958ee..8e33bef120b 100644 --- a/lib/ansible/errors/__init__.py +++ b/lib/ansible/errors/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re import traceback diff --git a/lib/ansible/errors/yaml_strings.py b/lib/ansible/errors/yaml_strings.py index e10a3f9d919..cc5cfb6c45a 100644 --- a/lib/ansible/errors/yaml_strings.py +++ b/lib/ansible/errors/yaml_strings.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations __all__ = [ 'YAML_SYNTAX_ERROR', diff --git a/lib/ansible/executor/__init__.py b/lib/ansible/executor/__init__.py index ae8ccff5952..64fee52484f 100644 --- a/lib/ansible/executor/__init__.py +++ b/lib/ansible/executor/__init__.py @@ -15,6 +15,4 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations diff --git a/lib/ansible/executor/discovery/python_target.py b/lib/ansible/executor/discovery/python_target.py index 71377332a81..f66588dedc5 100644 --- a/lib/ansible/executor/discovery/python_target.py +++ b/lib/ansible/executor/discovery/python_target.py @@ -4,8 +4,7 @@ # FUTURE: this could be swapped out for our bundled version of distro to move more complete platform # logic to the targets, so long as we maintain Py2.6 compat and don't need to do any kind of script assembly -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import platform diff --git a/lib/ansible/executor/interpreter_discovery.py b/lib/ansible/executor/interpreter_discovery.py index 283e790c1c9..deba1a5515f 100644 --- a/lib/ansible/executor/interpreter_discovery.py +++ b/lib/ansible/executor/interpreter_discovery.py @@ -1,8 +1,7 @@ # Copyright: (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import bisect import json diff --git a/lib/ansible/executor/module_common.py b/lib/ansible/executor/module_common.py index 3517543252e..717a39833ce 100644 --- a/lib/ansible/executor/module_common.py +++ b/lib/ansible/executor/module_common.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ast import base64 diff --git a/lib/ansible/executor/play_iterator.py b/lib/ansible/executor/play_iterator.py index 820db017fee..7acbe4172cb 100644 --- a/lib/ansible/executor/play_iterator.py +++ b/lib/ansible/executor/play_iterator.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import fnmatch diff --git a/lib/ansible/executor/playbook_executor.py b/lib/ansible/executor/playbook_executor.py index 52ad0c09a11..7c3ac4113bf 100644 --- a/lib/ansible/executor/playbook_executor.py +++ b/lib/ansible/executor/playbook_executor.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/executor/powershell/module_manifest.py b/lib/ansible/executor/powershell/module_manifest.py index 0720d23e971..3420bffde38 100644 --- a/lib/ansible/executor/powershell/module_manifest.py +++ b/lib/ansible/executor/powershell/module_manifest.py @@ -1,8 +1,7 @@ # (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import base64 import errno diff --git a/lib/ansible/executor/process/__init__.py b/lib/ansible/executor/process/__init__.py index ae8ccff5952..64fee52484f 100644 --- a/lib/ansible/executor/process/__init__.py +++ b/lib/ansible/executor/process/__init__.py @@ -15,6 +15,4 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations diff --git a/lib/ansible/executor/process/worker.py b/lib/ansible/executor/process/worker.py index c043137c95f..6c26aed164c 100644 --- a/lib/ansible/executor/process/worker.py +++ b/lib/ansible/executor/process/worker.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import sys diff --git a/lib/ansible/executor/stats.py b/lib/ansible/executor/stats.py index 13a053ba3ab..a7cc713b27d 100644 --- a/lib/ansible/executor/stats.py +++ b/lib/ansible/executor/stats.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import MutableMapping diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index 59c9eae40e7..89f6453c778 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -1,8 +1,7 @@ # (c) 2012-2014, Michael DeHaan # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import pty diff --git a/lib/ansible/executor/task_queue_manager.py b/lib/ansible/executor/task_queue_manager.py index 3bbf3d592e1..f6e8c8bf7e0 100644 --- a/lib/ansible/executor/task_queue_manager.py +++ b/lib/ansible/executor/task_queue_manager.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import sys diff --git a/lib/ansible/executor/task_result.py b/lib/ansible/executor/task_result.py index 543b860ebe7..0c85130c41a 100644 --- a/lib/ansible/executor/task_result.py +++ b/lib/ansible/executor/task_result.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible import constants as C from ansible.parsing.dataloader import DataLoader diff --git a/lib/ansible/galaxy/__init__.py b/lib/ansible/galaxy/__init__.py index 26d9f143650..cc961c5dd16 100644 --- a/lib/ansible/galaxy/__init__.py +++ b/lib/ansible/galaxy/__init__.py @@ -20,8 +20,7 @@ ######################################################################## ''' This manages remote shared Ansible objects, mainly roles''' -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/galaxy/api.py b/lib/ansible/galaxy/api.py index 54384a3b645..d4508c04123 100644 --- a/lib/ansible/galaxy/api.py +++ b/lib/ansible/galaxy/api.py @@ -2,8 +2,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import collections import datetime diff --git a/lib/ansible/galaxy/collection/__init__.py b/lib/ansible/galaxy/collection/__init__.py index 970c6d30952..99e493a1585 100644 --- a/lib/ansible/galaxy/collection/__init__.py +++ b/lib/ansible/galaxy/collection/__init__.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Installed collections management package.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import errno import fnmatch diff --git a/lib/ansible/galaxy/collection/concrete_artifact_manager.py b/lib/ansible/galaxy/collection/concrete_artifact_manager.py index d251127dec7..27ce287af3c 100644 --- a/lib/ansible/galaxy/collection/concrete_artifact_manager.py +++ b/lib/ansible/galaxy/collection/concrete_artifact_manager.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Concrete collection candidate management helper module.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/lib/ansible/galaxy/collection/galaxy_api_proxy.py b/lib/ansible/galaxy/collection/galaxy_api_proxy.py index 64d545f7f05..0c1b7df0bec 100644 --- a/lib/ansible/galaxy/collection/galaxy_api_proxy.py +++ b/lib/ansible/galaxy/collection/galaxy_api_proxy.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """A facade for interfacing with multiple Galaxy instances.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import typing as t diff --git a/lib/ansible/galaxy/collection/gpg.py b/lib/ansible/galaxy/collection/gpg.py index 8641f0d7f72..38ec189ddd0 100644 --- a/lib/ansible/galaxy/collection/gpg.py +++ b/lib/ansible/galaxy/collection/gpg.py @@ -2,12 +2,14 @@ # Copyright: (c) 2022, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Signature verification helpers.""" +from __future__ import annotations from ansible.errors import AnsibleError from ansible.galaxy.user_agent import user_agent from ansible.module_utils.urls import open_url import contextlib +import inspect import os import subprocess import sys @@ -136,8 +138,8 @@ class GpgBaseError(Exception): return ' '.join(cls.__doc__.split()) def __post_init__(self): - for field in dc_fields(self): - super(GpgBaseError, self).__setattr__(field.name, field.type(getattr(self, field.name))) + for field_name, field_type in inspect.get_annotations(type(self), eval_str=True).items(): + super(GpgBaseError, self).__setattr__(field_name, field_type(getattr(self, field_name))) @frozen_dataclass diff --git a/lib/ansible/galaxy/dependency_resolution/__init__.py b/lib/ansible/galaxy/dependency_resolution/__init__.py index eeffd299648..2e8ef147723 100644 --- a/lib/ansible/galaxy/dependency_resolution/__init__.py +++ b/lib/ansible/galaxy/dependency_resolution/__init__.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Dependency resolution machinery.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import typing as t diff --git a/lib/ansible/galaxy/dependency_resolution/dataclasses.py b/lib/ansible/galaxy/dependency_resolution/dataclasses.py index 171f71a0272..ea4c875adb4 100644 --- a/lib/ansible/galaxy/dependency_resolution/dataclasses.py +++ b/lib/ansible/galaxy/dependency_resolution/dataclasses.py @@ -4,8 +4,7 @@ """Dependency structs.""" # FIXME: add caching all over the place -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import typing as t diff --git a/lib/ansible/galaxy/dependency_resolution/errors.py b/lib/ansible/galaxy/dependency_resolution/errors.py index acd885750d9..1e183e9a11c 100644 --- a/lib/ansible/galaxy/dependency_resolution/errors.py +++ b/lib/ansible/galaxy/dependency_resolution/errors.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Dependency resolution exceptions.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations try: from resolvelib.resolvers import ( # pylint: disable=unused-import diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py index f13d3ecf2df..4ee42b15f97 100644 --- a/lib/ansible/galaxy/dependency_resolution/providers.py +++ b/lib/ansible/galaxy/dependency_resolution/providers.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Requirement provider interfaces.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import functools import typing as t diff --git a/lib/ansible/galaxy/dependency_resolution/reporters.py b/lib/ansible/galaxy/dependency_resolution/reporters.py index 69908b22435..640747ec332 100644 --- a/lib/ansible/galaxy/dependency_resolution/reporters.py +++ b/lib/ansible/galaxy/dependency_resolution/reporters.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Requiement reporter implementations.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations try: from resolvelib import BaseReporter diff --git a/lib/ansible/galaxy/dependency_resolution/resolvers.py b/lib/ansible/galaxy/dependency_resolution/resolvers.py index 87ca38d5d42..d15537dddbd 100644 --- a/lib/ansible/galaxy/dependency_resolution/resolvers.py +++ b/lib/ansible/galaxy/dependency_resolution/resolvers.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Requirement resolver implementations.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations try: from resolvelib import Resolver diff --git a/lib/ansible/galaxy/dependency_resolution/versioning.py b/lib/ansible/galaxy/dependency_resolution/versioning.py index 93adce45f24..74f956cf1e8 100644 --- a/lib/ansible/galaxy/dependency_resolution/versioning.py +++ b/lib/ansible/galaxy/dependency_resolution/versioning.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Version comparison helpers.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import operator diff --git a/lib/ansible/galaxy/role.py b/lib/ansible/galaxy/role.py index 2354ef7c3a1..50873c4ca82 100644 --- a/lib/ansible/galaxy/role.py +++ b/lib/ansible/galaxy/role.py @@ -19,8 +19,7 @@ # ######################################################################## -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import errno import datetime diff --git a/lib/ansible/galaxy/token.py b/lib/ansible/galaxy/token.py index 313d007379b..183e2af109e 100644 --- a/lib/ansible/galaxy/token.py +++ b/lib/ansible/galaxy/token.py @@ -18,8 +18,7 @@ # along with Ansible. If not, see . # ######################################################################## -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import base64 import os diff --git a/lib/ansible/galaxy/user_agent.py b/lib/ansible/galaxy/user_agent.py index c860bcdb612..a049e88dfb5 100644 --- a/lib/ansible/galaxy/user_agent.py +++ b/lib/ansible/galaxy/user_agent.py @@ -1,8 +1,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import platform import sys diff --git a/lib/ansible/inventory/data.py b/lib/ansible/inventory/data.py index 15a64202d90..7282d6fb751 100644 --- a/lib/ansible/inventory/data.py +++ b/lib/ansible/inventory/data.py @@ -16,8 +16,7 @@ # along with Ansible. If not, see . ############################################# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/lib/ansible/inventory/group.py b/lib/ansible/inventory/group.py index 65f1afed5c6..73c913ac9ee 100644 --- a/lib/ansible/inventory/group.py +++ b/lib/ansible/inventory/group.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import Mapping, MutableMapping from enum import Enum diff --git a/lib/ansible/inventory/helpers.py b/lib/ansible/inventory/helpers.py index 39c72210918..8293f905266 100644 --- a/lib/ansible/inventory/helpers.py +++ b/lib/ansible/inventory/helpers.py @@ -16,8 +16,7 @@ # along with Ansible. If not, see . ############################################# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.utils.vars import combine_vars diff --git a/lib/ansible/inventory/host.py b/lib/ansible/inventory/host.py index d8b4c6c694b..b7aea10e726 100644 --- a/lib/ansible/inventory/host.py +++ b/lib/ansible/inventory/host.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import Mapping, MutableMapping diff --git a/lib/ansible/inventory/manager.py b/lib/ansible/inventory/manager.py index a95c9d2bbd4..96df1f46477 100644 --- a/lib/ansible/inventory/manager.py +++ b/lib/ansible/inventory/manager.py @@ -16,8 +16,7 @@ # along with Ansible. If not, see . ############################################# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import fnmatch import os diff --git a/lib/ansible/module_utils/_text.py b/lib/ansible/module_utils/_text.py index f30a5e97126..b6dd62074f6 100644 --- a/lib/ansible/module_utils/_text.py +++ b/lib/ansible/module_utils/_text.py @@ -1,11 +1,10 @@ # Copyright (c), Toshio Kuratomi 2016 # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type """ .. warn:: Use ansible.module_utils.common.text.converters instead. """ +from __future__ import annotations # Backwards compat for people still calling it from this package # pylint: disable=unused-import diff --git a/lib/ansible/module_utils/api.py b/lib/ansible/module_utils/api.py index 2de8a4efc14..8f08772278e 100644 --- a/lib/ansible/module_utils/api.py +++ b/lib/ansible/module_utils/api.py @@ -23,8 +23,7 @@ The 'api' module provides the following common argument specs: - retries: number of attempts - retry_pause: delay between attempts in seconds """ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import copy import functools diff --git a/lib/ansible/module_utils/common/_collections_compat.py b/lib/ansible/module_utils/common/_collections_compat.py index f0f8f0d01cc..25f7889d8ef 100644 --- a/lib/ansible/module_utils/common/_collections_compat.py +++ b/lib/ansible/module_utils/common/_collections_compat.py @@ -6,8 +6,7 @@ Use `ansible.module_utils.six.moves.collections_abc` instead, which has been ava This module exists only for backwards compatibility. """ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations # Although this was originally intended for internal use only, it has wide adoption in collections. # This is due in part to sanity tests previously recommending its use over `collections` imports. diff --git a/lib/ansible/module_utils/common/_utils.py b/lib/ansible/module_utils/common/_utils.py index 66df3167771..8323e7c6432 100644 --- a/lib/ansible/module_utils/common/_utils.py +++ b/lib/ansible/module_utils/common/_utils.py @@ -1,14 +1,12 @@ # Copyright (c) 2018, Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type - """ Modules in _utils are waiting to find a better home. If you need to use them, be prepared for them to move to a different location in the future. """ +from __future__ import annotations def get_all_subclasses(cls): diff --git a/lib/ansible/module_utils/common/arg_spec.py b/lib/ansible/module_utils/common/arg_spec.py index d9f716efce6..37019e7df33 100644 --- a/lib/ansible/module_utils/common/arg_spec.py +++ b/lib/ansible/module_utils/common/arg_spec.py @@ -2,8 +2,7 @@ # Copyright (c) 2021 Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from copy import deepcopy diff --git a/lib/ansible/module_utils/common/collections.py b/lib/ansible/module_utils/common/collections.py index 06f08a82d7e..e4cb9ec1d70 100644 --- a/lib/ansible/module_utils/common/collections.py +++ b/lib/ansible/module_utils/common/collections.py @@ -3,8 +3,7 @@ # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) """Collection of low-level utility functions.""" -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.six import binary_type, text_type diff --git a/lib/ansible/module_utils/common/dict_transformations.py b/lib/ansible/module_utils/common/dict_transformations.py index 9ee7878f393..9c59d4ade47 100644 --- a/lib/ansible/module_utils/common/dict_transformations.py +++ b/lib/ansible/module_utils/common/dict_transformations.py @@ -3,8 +3,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/module_utils/common/file.py b/lib/ansible/module_utils/common/file.py index 72b0d2cf0f0..fa05b62899c 100644 --- a/lib/ansible/module_utils/common/file.py +++ b/lib/ansible/module_utils/common/file.py @@ -1,8 +1,7 @@ # Copyright (c) 2018, Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import stat diff --git a/lib/ansible/module_utils/common/json.py b/lib/ansible/module_utils/common/json.py index 33f1010424b..8038552e0ac 100644 --- a/lib/ansible/module_utils/common/json.py +++ b/lib/ansible/module_utils/common/json.py @@ -2,9 +2,7 @@ # Copyright (c) 2019 Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/lib/ansible/module_utils/common/locale.py b/lib/ansible/module_utils/common/locale.py index 08216f59f00..57b27a26eb8 100644 --- a/lib/ansible/module_utils/common/locale.py +++ b/lib/ansible/module_utils/common/locale.py @@ -1,8 +1,7 @@ # Copyright (c), Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.text.converters import to_native diff --git a/lib/ansible/module_utils/common/network.py b/lib/ansible/module_utils/common/network.py index c3874f89e1d..1c9c4502e0e 100644 --- a/lib/ansible/module_utils/common/network.py +++ b/lib/ansible/module_utils/common/network.py @@ -3,8 +3,7 @@ # General networking tools that may be used by all modules -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re from struct import pack diff --git a/lib/ansible/module_utils/common/parameters.py b/lib/ansible/module_utils/common/parameters.py index 386eb875cef..b6200749934 100644 --- a/lib/ansible/module_utils/common/parameters.py +++ b/lib/ansible/module_utils/common/parameters.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import datetime import os diff --git a/lib/ansible/module_utils/common/process.py b/lib/ansible/module_utils/common/process.py index 97761a4707d..6fae63c5f9a 100644 --- a/lib/ansible/module_utils/common/process.py +++ b/lib/ansible/module_utils/common/process.py @@ -1,8 +1,7 @@ # Copyright (c) 2018, Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/common/respawn.py b/lib/ansible/module_utils/common/respawn.py index 3e209ca01e5..e2cc7db2595 100644 --- a/lib/ansible/module_utils/common/respawn.py +++ b/lib/ansible/module_utils/common/respawn.py @@ -1,8 +1,7 @@ # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import subprocess diff --git a/lib/ansible/module_utils/common/sys_info.py b/lib/ansible/module_utils/common/sys_info.py index 206b36c764f..6ca451016f2 100644 --- a/lib/ansible/module_utils/common/sys_info.py +++ b/lib/ansible/module_utils/common/sys_info.py @@ -2,8 +2,7 @@ # Copyright (c), Toshio Kuratomi 2016 # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import platform diff --git a/lib/ansible/module_utils/common/text/converters.py b/lib/ansible/module_utils/common/text/converters.py index 5b41315bc8d..abef32d06d6 100644 --- a/lib/ansible/module_utils/common/text/converters.py +++ b/lib/ansible/module_utils/common/text/converters.py @@ -3,8 +3,7 @@ # (c) 2016 Toshio Kuratomi # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import codecs import datetime diff --git a/lib/ansible/module_utils/common/text/formatters.py b/lib/ansible/module_utils/common/text/formatters.py index 0c3d4951103..3096abec7c7 100644 --- a/lib/ansible/module_utils/common/text/formatters.py +++ b/lib/ansible/module_utils/common/text/formatters.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/module_utils/common/validation.py b/lib/ansible/module_utils/common/validation.py index 2389c0463df..7b2bc38b2e0 100644 --- a/lib/ansible/module_utils/common/validation.py +++ b/lib/ansible/module_utils/common/validation.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/lib/ansible/module_utils/common/warnings.py b/lib/ansible/module_utils/common/warnings.py index 9423e6a429b..14fe516cf5b 100644 --- a/lib/ansible/module_utils/common/warnings.py +++ b/lib/ansible/module_utils/common/warnings.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.six import string_types diff --git a/lib/ansible/module_utils/common/yaml.py b/lib/ansible/module_utils/common/yaml.py index b4d766bbee2..2e1ee52dc0b 100644 --- a/lib/ansible/module_utils/common/yaml.py +++ b/lib/ansible/module_utils/common/yaml.py @@ -6,8 +6,7 @@ This file provides ease of use shortcuts for loading and dumping YAML, preferring the YAML compiled C extensions to reduce duplicated code. """ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from functools import partial as _partial diff --git a/lib/ansible/module_utils/compat/_selectors2.py b/lib/ansible/module_utils/compat/_selectors2.py index 4a4fcc3212b..7caf4c31d7f 100644 --- a/lib/ansible/module_utils/compat/_selectors2.py +++ b/lib/ansible/module_utils/compat/_selectors2.py @@ -17,6 +17,7 @@ # does not follow this behavior and instead returns that no file descriptor # events have occurred rather than retry the syscall. The decision to drop # support for select.devpoll is made to maintain 100% test coverage. +from __future__ import annotations import errno import math diff --git a/lib/ansible/module_utils/compat/datetime.py b/lib/ansible/module_utils/compat/datetime.py index 30edaed5cfd..d3cdc0d3d38 100644 --- a/lib/ansible/module_utils/compat/datetime.py +++ b/lib/ansible/module_utils/compat/datetime.py @@ -1,9 +1,7 @@ # Copyright (c) 2023 Ansible # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.six import PY3 diff --git a/lib/ansible/module_utils/compat/importlib.py b/lib/ansible/module_utils/compat/importlib.py index a3dca6b21c8..c7555cb406b 100644 --- a/lib/ansible/module_utils/compat/importlib.py +++ b/lib/ansible/module_utils/compat/importlib.py @@ -1,9 +1,7 @@ # Copyright (c) 2020 Matt Martz # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/lib/ansible/module_utils/compat/paramiko.py b/lib/ansible/module_utils/compat/paramiko.py index 095dfa50dde..8c84261cef8 100644 --- a/lib/ansible/module_utils/compat/paramiko.py +++ b/lib/ansible/module_utils/compat/paramiko.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import types # pylint: disable=unused-import import warnings diff --git a/lib/ansible/module_utils/compat/selectors.py b/lib/ansible/module_utils/compat/selectors.py index 0c4adc9f0f5..1f30929fb1b 100644 --- a/lib/ansible/module_utils/compat/selectors.py +++ b/lib/ansible/module_utils/compat/selectors.py @@ -15,14 +15,13 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type ''' Compat selectors library. Python-3.5 has this builtin. The selectors2 package exists on pypi to backport the functionality as far as python-2.6. ''' +from __future__ import annotations + # The following makes it easier for us to script updates of the bundled code _BUNDLED_METADATA = {"pypi_name": "selectors2", "version": "1.1.1", "version_constraints": ">1.0,<2.0"} diff --git a/lib/ansible/module_utils/compat/selinux.py b/lib/ansible/module_utils/compat/selinux.py index ca58098a952..0900388b761 100644 --- a/lib/ansible/module_utils/compat/selinux.py +++ b/lib/ansible/module_utils/compat/selinux.py @@ -1,8 +1,7 @@ # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import sys diff --git a/lib/ansible/module_utils/compat/typing.py b/lib/ansible/module_utils/compat/typing.py index 94b1dee7cf7..d753f72b25e 100644 --- a/lib/ansible/module_utils/compat/typing.py +++ b/lib/ansible/module_utils/compat/typing.py @@ -1,6 +1,5 @@ """Compatibility layer for the `typing` module, providing all Python versions access to the newest type-hinting features.""" -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # pylint: disable=wildcard-import,unused-wildcard-import diff --git a/lib/ansible/module_utils/compat/version.py b/lib/ansible/module_utils/compat/version.py index f4db1ef3d52..61a39dfa2d9 100644 --- a/lib/ansible/module_utils/compat/version.py +++ b/lib/ansible/module_utils/compat/version.py @@ -25,8 +25,7 @@ Every version number class implements the following interface: of the same class, thus must follow the same rules) """ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/module_utils/connection.py b/lib/ansible/module_utils/connection.py index e4e507dbb3b..cc889696e70 100644 --- a/lib/ansible/module_utils/connection.py +++ b/lib/ansible/module_utils/connection.py @@ -26,8 +26,7 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import hashlib diff --git a/lib/ansible/module_utils/distro/__init__.py b/lib/ansible/module_utils/distro/__init__.py index b70f29c9416..a8c29a6ce0a 100644 --- a/lib/ansible/module_utils/distro/__init__.py +++ b/lib/ansible/module_utils/distro/__init__.py @@ -15,13 +15,12 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type ''' Compat distro library. ''' +from __future__ import annotations + # The following makes it easier for us to script updates of the bundled code _BUNDLED_METADATA = {"pypi_name": "distro", "version": "1.6.0"} diff --git a/lib/ansible/module_utils/distro/_distro.py b/lib/ansible/module_utils/distro/_distro.py index 19262a41db1..74c0b99408a 100644 --- a/lib/ansible/module_utils/distro/_distro.py +++ b/lib/ansible/module_utils/distro/_distro.py @@ -30,6 +30,7 @@ Python 2.6 and removed in Python 3.8. Still, there are many cases in which access to OS distribution information is needed. See `Python issue 1322 `_ for more information. """ +from __future__ import annotations import argparse import json diff --git a/lib/ansible/module_utils/errors.py b/lib/ansible/module_utils/errors.py index cbbd86c01cb..1196fac2b26 100644 --- a/lib/ansible/module_utils/errors.py +++ b/lib/ansible/module_utils/errors.py @@ -2,8 +2,7 @@ # Copyright (c) 2021 Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations class AnsibleFallbackNotFound(Exception): diff --git a/lib/ansible/module_utils/facts/__init__.py b/lib/ansible/module_utils/facts/__init__.py index 96ab778bf01..6d2469137fa 100644 --- a/lib/ansible/module_utils/facts/__init__.py +++ b/lib/ansible/module_utils/facts/__init__.py @@ -26,8 +26,7 @@ # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # import from the compat api because 2.0-2.3 had a module_utils.facts.ansible_facts # and get_all_facts in top level namespace diff --git a/lib/ansible/module_utils/facts/ansible_collector.py b/lib/ansible/module_utils/facts/ansible_collector.py index e9bafe297c5..ac81d1fd646 100644 --- a/lib/ansible/module_utils/facts/ansible_collector.py +++ b/lib/ansible/module_utils/facts/ansible_collector.py @@ -26,8 +26,7 @@ # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import fnmatch import sys diff --git a/lib/ansible/module_utils/facts/collector.py b/lib/ansible/module_utils/facts/collector.py index ac52fe8b4d3..616188b3db9 100644 --- a/lib/ansible/module_utils/facts/collector.py +++ b/lib/ansible/module_utils/facts/collector.py @@ -26,8 +26,7 @@ # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections import defaultdict diff --git a/lib/ansible/module_utils/facts/compat.py b/lib/ansible/module_utils/facts/compat.py index a69fee3729d..38953140d80 100644 --- a/lib/ansible/module_utils/facts/compat.py +++ b/lib/ansible/module_utils/facts/compat.py @@ -26,8 +26,7 @@ # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.namespace import PrefixFactNamespace from ansible.module_utils.facts import default_collectors diff --git a/lib/ansible/module_utils/facts/default_collectors.py b/lib/ansible/module_utils/facts/default_collectors.py index cf0ef23ef4f..1dcbd7c52a1 100644 --- a/lib/ansible/module_utils/facts/default_collectors.py +++ b/lib/ansible/module_utils/facts/default_collectors.py @@ -25,8 +25,7 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.module_utils.compat.typing as t diff --git a/lib/ansible/module_utils/facts/hardware/aix.py b/lib/ansible/module_utils/facts/hardware/aix.py index dc37394f450..db34fe147a6 100644 --- a/lib/ansible/module_utils/facts/hardware/aix.py +++ b/lib/ansible/module_utils/facts/hardware/aix.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/module_utils/facts/hardware/base.py b/lib/ansible/module_utils/facts/hardware/base.py index 846bb302320..8710ed57fcc 100644 --- a/lib/ansible/module_utils/facts/hardware/base.py +++ b/lib/ansible/module_utils/facts/hardware/base.py @@ -26,8 +26,7 @@ # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.module_utils.compat.typing as t diff --git a/lib/ansible/module_utils/facts/hardware/darwin.py b/lib/ansible/module_utils/facts/hardware/darwin.py index d6a8e11e191..74e4ce4e2af 100644 --- a/lib/ansible/module_utils/facts/hardware/darwin.py +++ b/lib/ansible/module_utils/facts/hardware/darwin.py @@ -14,8 +14,7 @@ # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import struct import time diff --git a/lib/ansible/module_utils/facts/hardware/dragonfly.py b/lib/ansible/module_utils/facts/hardware/dragonfly.py index ea24151fdb7..ffbde723101 100644 --- a/lib/ansible/module_utils/facts/hardware/dragonfly.py +++ b/lib/ansible/module_utils/facts/hardware/dragonfly.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.hardware.base import HardwareCollector from ansible.module_utils.facts.hardware.freebsd import FreeBSDHardware diff --git a/lib/ansible/module_utils/facts/hardware/freebsd.py b/lib/ansible/module_utils/facts/hardware/freebsd.py index cce2ab268d8..e44da3aaacc 100644 --- a/lib/ansible/module_utils/facts/hardware/freebsd.py +++ b/lib/ansible/module_utils/facts/hardware/freebsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import json diff --git a/lib/ansible/module_utils/facts/hardware/hpux.py b/lib/ansible/module_utils/facts/hardware/hpux.py index ae72ed8e486..abb9dada663 100644 --- a/lib/ansible/module_utils/facts/hardware/hpux.py +++ b/lib/ansible/module_utils/facts/hardware/hpux.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import re diff --git a/lib/ansible/module_utils/facts/hardware/hurd.py b/lib/ansible/module_utils/facts/hardware/hurd.py index 306e13c1354..491670c56b1 100644 --- a/lib/ansible/module_utils/facts/hardware/hurd.py +++ b/lib/ansible/module_utils/facts/hardware/hurd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.timeout import TimeoutError from ansible.module_utils.facts.hardware.base import HardwareCollector diff --git a/lib/ansible/module_utils/facts/hardware/linux.py b/lib/ansible/module_utils/facts/hardware/linux.py index f6e87ac3246..3ec513c5cb5 100644 --- a/lib/ansible/module_utils/facts/hardware/linux.py +++ b/lib/ansible/module_utils/facts/hardware/linux.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import collections import errno diff --git a/lib/ansible/module_utils/facts/hardware/netbsd.py b/lib/ansible/module_utils/facts/hardware/netbsd.py index c6557aa67da..7d024198392 100644 --- a/lib/ansible/module_utils/facts/hardware/netbsd.py +++ b/lib/ansible/module_utils/facts/hardware/netbsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import re diff --git a/lib/ansible/module_utils/facts/hardware/openbsd.py b/lib/ansible/module_utils/facts/hardware/openbsd.py index cd5e21e9613..751ee6165dd 100644 --- a/lib/ansible/module_utils/facts/hardware/openbsd.py +++ b/lib/ansible/module_utils/facts/hardware/openbsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re import time diff --git a/lib/ansible/module_utils/facts/hardware/sunos.py b/lib/ansible/module_utils/facts/hardware/sunos.py index 54850fe3bd8..1340a7231d3 100644 --- a/lib/ansible/module_utils/facts/hardware/sunos.py +++ b/lib/ansible/module_utils/facts/hardware/sunos.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re import time diff --git a/lib/ansible/module_utils/facts/namespace.py b/lib/ansible/module_utils/facts/namespace.py index 2d6bf8a5e91..3d0eb25353d 100644 --- a/lib/ansible/module_utils/facts/namespace.py +++ b/lib/ansible/module_utils/facts/namespace.py @@ -25,8 +25,7 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class FactNamespace: diff --git a/lib/ansible/module_utils/facts/network/aix.py b/lib/ansible/module_utils/facts/network/aix.py index e9c90c64139..29a679d84b1 100644 --- a/lib/ansible/module_utils/facts/network/aix.py +++ b/lib/ansible/module_utils/facts/network/aix.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/module_utils/facts/network/base.py b/lib/ansible/module_utils/facts/network/base.py index 8243f06ccfe..7e13e168b32 100644 --- a/lib/ansible/module_utils/facts/network/base.py +++ b/lib/ansible/module_utils/facts/network/base.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.module_utils.compat.typing as t diff --git a/lib/ansible/module_utils/facts/network/darwin.py b/lib/ansible/module_utils/facts/network/darwin.py index 90117e5360c..775d40719d9 100644 --- a/lib/ansible/module_utils/facts/network/darwin.py +++ b/lib/ansible/module_utils/facts/network/darwin.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.network.base import NetworkCollector from ansible.module_utils.facts.network.generic_bsd import GenericBsdIfconfigNetwork diff --git a/lib/ansible/module_utils/facts/network/dragonfly.py b/lib/ansible/module_utils/facts/network/dragonfly.py index e43bbb28ec9..8a3424594e8 100644 --- a/lib/ansible/module_utils/facts/network/dragonfly.py +++ b/lib/ansible/module_utils/facts/network/dragonfly.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.network.base import NetworkCollector from ansible.module_utils.facts.network.generic_bsd import GenericBsdIfconfigNetwork diff --git a/lib/ansible/module_utils/facts/network/fc_wwn.py b/lib/ansible/module_utils/facts/network/fc_wwn.py index dc2e3d6cf9f..f53cc53927d 100644 --- a/lib/ansible/module_utils/facts/network/fc_wwn.py +++ b/lib/ansible/module_utils/facts/network/fc_wwn.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys import glob diff --git a/lib/ansible/module_utils/facts/network/freebsd.py b/lib/ansible/module_utils/facts/network/freebsd.py index 36f6eec7c43..4497010925a 100644 --- a/lib/ansible/module_utils/facts/network/freebsd.py +++ b/lib/ansible/module_utils/facts/network/freebsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.network.base import NetworkCollector from ansible.module_utils.facts.network.generic_bsd import GenericBsdIfconfigNetwork diff --git a/lib/ansible/module_utils/facts/network/generic_bsd.py b/lib/ansible/module_utils/facts/network/generic_bsd.py index 8d640f2152f..54188638c60 100644 --- a/lib/ansible/module_utils/facts/network/generic_bsd.py +++ b/lib/ansible/module_utils/facts/network/generic_bsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re import socket diff --git a/lib/ansible/module_utils/facts/network/hpux.py b/lib/ansible/module_utils/facts/network/hpux.py index add57be8d3f..61e1bdc644f 100644 --- a/lib/ansible/module_utils/facts/network/hpux.py +++ b/lib/ansible/module_utils/facts/network/hpux.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.network.base import Network, NetworkCollector diff --git a/lib/ansible/module_utils/facts/network/hurd.py b/lib/ansible/module_utils/facts/network/hurd.py index 518df3900a7..05f23e5f445 100644 --- a/lib/ansible/module_utils/facts/network/hurd.py +++ b/lib/ansible/module_utils/facts/network/hurd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/facts/network/iscsi.py b/lib/ansible/module_utils/facts/network/iscsi.py index ef5ac398a98..8f7a61590fb 100644 --- a/lib/ansible/module_utils/facts/network/iscsi.py +++ b/lib/ansible/module_utils/facts/network/iscsi.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/lib/ansible/module_utils/facts/network/linux.py b/lib/ansible/module_utils/facts/network/linux.py index a189f387384..560cd255f37 100644 --- a/lib/ansible/module_utils/facts/network/linux.py +++ b/lib/ansible/module_utils/facts/network/linux.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import glob import os diff --git a/lib/ansible/module_utils/facts/network/netbsd.py b/lib/ansible/module_utils/facts/network/netbsd.py index de8ceff60c3..dde9e6c2169 100644 --- a/lib/ansible/module_utils/facts/network/netbsd.py +++ b/lib/ansible/module_utils/facts/network/netbsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.network.base import NetworkCollector from ansible.module_utils.facts.network.generic_bsd import GenericBsdIfconfigNetwork diff --git a/lib/ansible/module_utils/facts/network/nvme.py b/lib/ansible/module_utils/facts/network/nvme.py index 1d759566c99..7eb070dcf5d 100644 --- a/lib/ansible/module_utils/facts/network/nvme.py +++ b/lib/ansible/module_utils/facts/network/nvme.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/lib/ansible/module_utils/facts/network/openbsd.py b/lib/ansible/module_utils/facts/network/openbsd.py index 9e11d82f372..691e6241848 100644 --- a/lib/ansible/module_utils/facts/network/openbsd.py +++ b/lib/ansible/module_utils/facts/network/openbsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.network.base import NetworkCollector from ansible.module_utils.facts.network.generic_bsd import GenericBsdIfconfigNetwork diff --git a/lib/ansible/module_utils/facts/network/sunos.py b/lib/ansible/module_utils/facts/network/sunos.py index adba14c684c..f2f064cc61d 100644 --- a/lib/ansible/module_utils/facts/network/sunos.py +++ b/lib/ansible/module_utils/facts/network/sunos.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/module_utils/facts/other/facter.py b/lib/ansible/module_utils/facts/other/facter.py index 063065251dd..ec1771ecfac 100644 --- a/lib/ansible/module_utils/facts/other/facter.py +++ b/lib/ansible/module_utils/facts/other/facter.py @@ -1,8 +1,7 @@ # Copyright (c) 2023 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/lib/ansible/module_utils/facts/other/ohai.py b/lib/ansible/module_utils/facts/other/ohai.py index 90c553980b9..75968ef29f1 100644 --- a/lib/ansible/module_utils/facts/other/ohai.py +++ b/lib/ansible/module_utils/facts/other/ohai.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/lib/ansible/module_utils/facts/packages.py b/lib/ansible/module_utils/facts/packages.py index 53f74a16620..21be56fab26 100644 --- a/lib/ansible/module_utils/facts/packages.py +++ b/lib/ansible/module_utils/facts/packages.py @@ -1,8 +1,7 @@ # (c) 2018, Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from abc import ABCMeta, abstractmethod diff --git a/lib/ansible/module_utils/facts/sysctl.py b/lib/ansible/module_utils/facts/sysctl.py index d7bcc8a1056..1f94091200b 100644 --- a/lib/ansible/module_utils/facts/sysctl.py +++ b/lib/ansible/module_utils/facts/sysctl.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/module_utils/facts/system/apparmor.py b/lib/ansible/module_utils/facts/system/apparmor.py index 3b702f9d323..ec29e883e09 100644 --- a/lib/ansible/module_utils/facts/system/apparmor.py +++ b/lib/ansible/module_utils/facts/system/apparmor.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/facts/system/caps.py b/lib/ansible/module_utils/facts/system/caps.py index 3692f2079a0..365a04592ac 100644 --- a/lib/ansible/module_utils/facts/system/caps.py +++ b/lib/ansible/module_utils/facts/system/caps.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.module_utils.compat.typing as t diff --git a/lib/ansible/module_utils/facts/system/chroot.py b/lib/ansible/module_utils/facts/system/chroot.py index 94138a004f5..bbf4b39dd3e 100644 --- a/lib/ansible/module_utils/facts/system/chroot.py +++ b/lib/ansible/module_utils/facts/system/chroot.py @@ -1,7 +1,6 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/facts/system/cmdline.py b/lib/ansible/module_utils/facts/system/cmdline.py index 782186dcaf8..12376dc0ba1 100644 --- a/lib/ansible/module_utils/facts/system/cmdline.py +++ b/lib/ansible/module_utils/facts/system/cmdline.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import shlex diff --git a/lib/ansible/module_utils/facts/system/date_time.py b/lib/ansible/module_utils/facts/system/date_time.py index 93af6dcf01f..908d00aa163 100644 --- a/lib/ansible/module_utils/facts/system/date_time.py +++ b/lib/ansible/module_utils/facts/system/date_time.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import datetime import time diff --git a/lib/ansible/module_utils/facts/system/distribution.py b/lib/ansible/module_utils/facts/system/distribution.py index 7cb729d14e0..61cc8f6c971 100644 --- a/lib/ansible/module_utils/facts/system/distribution.py +++ b/lib/ansible/module_utils/facts/system/distribution.py @@ -3,8 +3,7 @@ # Copyright: (c) Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import platform diff --git a/lib/ansible/module_utils/facts/system/dns.py b/lib/ansible/module_utils/facts/system/dns.py index d913f4a30d4..7ef69d136fc 100644 --- a/lib/ansible/module_utils/facts/system/dns.py +++ b/lib/ansible/module_utils/facts/system/dns.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.module_utils.compat.typing as t diff --git a/lib/ansible/module_utils/facts/system/env.py b/lib/ansible/module_utils/facts/system/env.py index 605443fa39d..4547924532e 100644 --- a/lib/ansible/module_utils/facts/system/env.py +++ b/lib/ansible/module_utils/facts/system/env.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/facts/system/fips.py b/lib/ansible/module_utils/facts/system/fips.py index 7e56610e1b4..dbecd8fbaa2 100644 --- a/lib/ansible/module_utils/facts/system/fips.py +++ b/lib/ansible/module_utils/facts/system/fips.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.module_utils.compat.typing as t diff --git a/lib/ansible/module_utils/facts/system/loadavg.py b/lib/ansible/module_utils/facts/system/loadavg.py index 8475f2ae113..37cb554434f 100644 --- a/lib/ansible/module_utils/facts/system/loadavg.py +++ b/lib/ansible/module_utils/facts/system/loadavg.py @@ -1,8 +1,7 @@ # (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/facts/system/local.py b/lib/ansible/module_utils/facts/system/local.py index 66813509b4a..3d656f5a345 100644 --- a/lib/ansible/module_utils/facts/system/local.py +++ b/lib/ansible/module_utils/facts/system/local.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import glob import json diff --git a/lib/ansible/module_utils/facts/system/lsb.py b/lib/ansible/module_utils/facts/system/lsb.py index 2dc1433fd06..5767536b1d7 100644 --- a/lib/ansible/module_utils/facts/system/lsb.py +++ b/lib/ansible/module_utils/facts/system/lsb.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/facts/system/pkg_mgr.py b/lib/ansible/module_utils/facts/system/pkg_mgr.py index 14ad0a663ba..5b7c3119712 100644 --- a/lib/ansible/module_utils/facts/system/pkg_mgr.py +++ b/lib/ansible/module_utils/facts/system/pkg_mgr.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import subprocess diff --git a/lib/ansible/module_utils/facts/system/platform.py b/lib/ansible/module_utils/facts/system/platform.py index b9478015a72..94819861b4b 100644 --- a/lib/ansible/module_utils/facts/system/platform.py +++ b/lib/ansible/module_utils/facts/system/platform.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re import socket diff --git a/lib/ansible/module_utils/facts/system/python.py b/lib/ansible/module_utils/facts/system/python.py index 50b66dde3e4..0252c0c96a7 100644 --- a/lib/ansible/module_utils/facts/system/python.py +++ b/lib/ansible/module_utils/facts/system/python.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/lib/ansible/module_utils/facts/system/selinux.py b/lib/ansible/module_utils/facts/system/selinux.py index 5c6b012bb30..c110f17e720 100644 --- a/lib/ansible/module_utils/facts/system/selinux.py +++ b/lib/ansible/module_utils/facts/system/selinux.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.module_utils.compat.typing as t diff --git a/lib/ansible/module_utils/facts/system/service_mgr.py b/lib/ansible/module_utils/facts/system/service_mgr.py index 701def99c0b..4dfa7e99d44 100644 --- a/lib/ansible/module_utils/facts/system/service_mgr.py +++ b/lib/ansible/module_utils/facts/system/service_mgr.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import platform diff --git a/lib/ansible/module_utils/facts/system/ssh_pub_keys.py b/lib/ansible/module_utils/facts/system/ssh_pub_keys.py index 85691c73c85..7214dea3de6 100644 --- a/lib/ansible/module_utils/facts/system/ssh_pub_keys.py +++ b/lib/ansible/module_utils/facts/system/ssh_pub_keys.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.module_utils.compat.typing as t diff --git a/lib/ansible/module_utils/facts/system/user.py b/lib/ansible/module_utils/facts/system/user.py index 2efa9935c4f..64b8fef8be6 100644 --- a/lib/ansible/module_utils/facts/system/user.py +++ b/lib/ansible/module_utils/facts/system/user.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import getpass import os diff --git a/lib/ansible/module_utils/facts/timeout.py b/lib/ansible/module_utils/facts/timeout.py index ebb71cc6986..5fb749fb6b3 100644 --- a/lib/ansible/module_utils/facts/timeout.py +++ b/lib/ansible/module_utils/facts/timeout.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import multiprocessing import multiprocessing.pool as mp diff --git a/lib/ansible/module_utils/facts/utils.py b/lib/ansible/module_utils/facts/utils.py index a6027ab5dbc..f7f6f19cec0 100644 --- a/lib/ansible/module_utils/facts/utils.py +++ b/lib/ansible/module_utils/facts/utils.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import fcntl import os diff --git a/lib/ansible/module_utils/facts/virtual/base.py b/lib/ansible/module_utils/facts/virtual/base.py index 67b59a5503a..943ce406d86 100644 --- a/lib/ansible/module_utils/facts/virtual/base.py +++ b/lib/ansible/module_utils/facts/virtual/base.py @@ -16,8 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.module_utils.compat.typing as t diff --git a/lib/ansible/module_utils/facts/virtual/dragonfly.py b/lib/ansible/module_utils/facts/virtual/dragonfly.py index b176f8bf53c..8e1aa0dcd28 100644 --- a/lib/ansible/module_utils/facts/virtual/dragonfly.py +++ b/lib/ansible/module_utils/facts/virtual/dragonfly.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.virtual.freebsd import FreeBSDVirtual, VirtualCollector diff --git a/lib/ansible/module_utils/facts/virtual/freebsd.py b/lib/ansible/module_utils/facts/virtual/freebsd.py index 7062d019843..819aa029ddc 100644 --- a/lib/ansible/module_utils/facts/virtual/freebsd.py +++ b/lib/ansible/module_utils/facts/virtual/freebsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/facts/virtual/hpux.py b/lib/ansible/module_utils/facts/virtual/hpux.py index 10574827e44..5164aab835b 100644 --- a/lib/ansible/module_utils/facts/virtual/hpux.py +++ b/lib/ansible/module_utils/facts/virtual/hpux.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import re diff --git a/lib/ansible/module_utils/facts/virtual/linux.py b/lib/ansible/module_utils/facts/virtual/linux.py index 31fa061749a..72d2633d504 100644 --- a/lib/ansible/module_utils/facts/virtual/linux.py +++ b/lib/ansible/module_utils/facts/virtual/linux.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import glob import os diff --git a/lib/ansible/module_utils/facts/virtual/netbsd.py b/lib/ansible/module_utils/facts/virtual/netbsd.py index b4ef14ed046..1689ac30414 100644 --- a/lib/ansible/module_utils/facts/virtual/netbsd.py +++ b/lib/ansible/module_utils/facts/virtual/netbsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/facts/virtual/openbsd.py b/lib/ansible/module_utils/facts/virtual/openbsd.py index c449028d42d..5c12df809fa 100644 --- a/lib/ansible/module_utils/facts/virtual/openbsd.py +++ b/lib/ansible/module_utils/facts/virtual/openbsd.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/module_utils/facts/virtual/sunos.py b/lib/ansible/module_utils/facts/virtual/sunos.py index 1e92677e4ce..7a595f701a5 100644 --- a/lib/ansible/module_utils/facts/virtual/sunos.py +++ b/lib/ansible/module_utils/facts/virtual/sunos.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/module_utils/facts/virtual/sysctl.py b/lib/ansible/module_utils/facts/virtual/sysctl.py index 1c7b2b34848..649f335ad72 100644 --- a/lib/ansible/module_utils/facts/virtual/sysctl.py +++ b/lib/ansible/module_utils/facts/virtual/sysctl.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/module_utils/json_utils.py b/lib/ansible/module_utils/json_utils.py index 1ec971ccd2b..c6d4c7642d8 100644 --- a/lib/ansible/module_utils/json_utils.py +++ b/lib/ansible/module_utils/json_utils.py @@ -24,8 +24,7 @@ # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json # pylint: disable=unused-import diff --git a/lib/ansible/module_utils/parsing/convert_bool.py b/lib/ansible/module_utils/parsing/convert_bool.py index fb331d89cf8..3367b2a09fa 100644 --- a/lib/ansible/module_utils/parsing/convert_bool.py +++ b/lib/ansible/module_utils/parsing/convert_bool.py @@ -1,8 +1,7 @@ # Copyright: 2017, Ansible Project # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause ) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.six import binary_type, text_type from ansible.module_utils.common.text.converters import to_text diff --git a/lib/ansible/module_utils/pycompat24.py b/lib/ansible/module_utils/pycompat24.py index d57f968a8c7..56360679174 100644 --- a/lib/ansible/module_utils/pycompat24.py +++ b/lib/ansible/module_utils/pycompat24.py @@ -26,8 +26,7 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/lib/ansible/module_utils/service.py b/lib/ansible/module_utils/service.py index e79f40edbd3..517a243e54e 100644 --- a/lib/ansible/module_utils/service.py +++ b/lib/ansible/module_utils/service.py @@ -26,8 +26,7 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import glob import os diff --git a/lib/ansible/module_utils/six/__init__.py b/lib/ansible/module_utils/six/__init__.py index f2d41c83517..4e74af7c00e 100644 --- a/lib/ansible/module_utils/six/__init__.py +++ b/lib/ansible/module_utils/six/__init__.py @@ -25,7 +25,7 @@ """Utilities for writing code that runs on Python 2 and 3""" -from __future__ import absolute_import +from __future__ import annotations import functools import itertools diff --git a/lib/ansible/module_utils/splitter.py b/lib/ansible/module_utils/splitter.py index c170b1cf7c8..7bddd32dae1 100644 --- a/lib/ansible/module_utils/splitter.py +++ b/lib/ansible/module_utils/splitter.py @@ -26,8 +26,7 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def _get_quote_state(token, quote_char): diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py index c33319270a0..83ffc1ea0dc 100644 --- a/lib/ansible/module_utils/urls.py +++ b/lib/ansible/module_utils/urls.py @@ -32,8 +32,7 @@ for users making use of a module. If possible, avoid third party libraries by us this code instead. ''' -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import atexit import base64 diff --git a/lib/ansible/module_utils/yumdnf.py b/lib/ansible/module_utils/yumdnf.py index 7eb9d5fc2b7..9aaba00de6f 100644 --- a/lib/ansible/module_utils/yumdnf.py +++ b/lib/ansible/module_utils/yumdnf.py @@ -9,8 +9,7 @@ # - Abhijeet Kasurde (@Akasurde) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import time diff --git a/lib/ansible/modules/add_host.py b/lib/ansible/modules/add_host.py index eb9d55979a2..de3c8619135 100644 --- a/lib/ansible/modules/add_host.py +++ b/lib/ansible/modules/add_host.py @@ -4,8 +4,7 @@ # Copyright: Ansible Team # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/apt.py b/lib/ansible/modules/apt.py index edd3d843d55..b5f3dcd3df5 100644 --- a/lib/ansible/modules/apt.py +++ b/lib/ansible/modules/apt.py @@ -6,8 +6,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/apt_key.py b/lib/ansible/modules/apt_key.py index 295dc262a3a..669bad20c6f 100644 --- a/lib/ansible/modules/apt_key.py +++ b/lib/ansible/modules/apt_key.py @@ -5,8 +5,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/apt_repository.py b/lib/ansible/modules/apt_repository.py index 158913a1204..055d8864384 100644 --- a/lib/ansible/modules/apt_repository.py +++ b/lib/ansible/modules/apt_repository.py @@ -6,8 +6,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/assemble.py b/lib/ansible/modules/assemble.py index c93b4ff67db..77c33bef104 100644 --- a/lib/ansible/modules/assemble.py +++ b/lib/ansible/modules/assemble.py @@ -5,8 +5,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/assert.py b/lib/ansible/modules/assert.py index 0070f25671e..1b1590fb5e2 100644 --- a/lib/ansible/modules/assert.py +++ b/lib/ansible/modules/assert.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Dag Wieers # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/async_status.py b/lib/ansible/modules/async_status.py index c54ce3c6246..ee584e3e02b 100644 --- a/lib/ansible/modules/async_status.py +++ b/lib/ansible/modules/async_status.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Michael DeHaan , and others # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/async_wrapper.py b/lib/ansible/modules/async_wrapper.py index b585396e45e..61c1cd52adb 100644 --- a/lib/ansible/modules/async_wrapper.py +++ b/lib/ansible/modules/async_wrapper.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Michael DeHaan , and others # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import errno diff --git a/lib/ansible/modules/blockinfile.py b/lib/ansible/modules/blockinfile.py index a8b21d3dbad..4da042bbd4a 100644 --- a/lib/ansible/modules/blockinfile.py +++ b/lib/ansible/modules/blockinfile.py @@ -4,8 +4,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/command.py b/lib/ansible/modules/command.py index c305952975c..4a3b8e133a0 100644 --- a/lib/ansible/modules/command.py +++ b/lib/ansible/modules/command.py @@ -4,8 +4,7 @@ # Copyright: (c) 2016, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/copy.py b/lib/ansible/modules/copy.py index 0e7dfe28093..6f7a14e782e 100644 --- a/lib/ansible/modules/copy.py +++ b/lib/ansible/modules/copy.py @@ -4,8 +4,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/cron.py b/lib/ansible/modules/cron.py index d43c8133831..0aa497968be 100644 --- a/lib/ansible/modules/cron.py +++ b/lib/ansible/modules/cron.py @@ -7,8 +7,7 @@ # Copyright: (c) 2015, Luca Berruti # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/deb822_repository.py b/lib/ansible/modules/deb822_repository.py index 6b73cfe29e0..980884f07f2 100644 --- a/lib/ansible/modules/deb822_repository.py +++ b/lib/ansible/modules/deb822_repository.py @@ -2,8 +2,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' author: 'Ansible Core Team (@ansible)' diff --git a/lib/ansible/modules/debconf.py b/lib/ansible/modules/debconf.py index 5ff14029801..994bcda1638 100644 --- a/lib/ansible/modules/debconf.py +++ b/lib/ansible/modules/debconf.py @@ -3,8 +3,7 @@ # Copyright: (c) 2014, Brian Coca # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/debug.py b/lib/ansible/modules/debug.py index 6e6301c8e6f..cdaf118cd2d 100644 --- a/lib/ansible/modules/debug.py +++ b/lib/ansible/modules/debug.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012 Dag Wieers # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/dnf.py b/lib/ansible/modules/dnf.py index 7f5afc3908e..9c7f5019e44 100644 --- a/lib/ansible/modules/dnf.py +++ b/lib/ansible/modules/dnf.py @@ -6,8 +6,7 @@ # # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/dnf5.py b/lib/ansible/modules/dnf5.py index 3f54816b996..facc2e37514 100644 --- a/lib/ansible/modules/dnf5.py +++ b/lib/ansible/modules/dnf5.py @@ -2,9 +2,8 @@ # Copyright 2023 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """ module: dnf5 diff --git a/lib/ansible/modules/dpkg_selections.py b/lib/ansible/modules/dpkg_selections.py index 7c8a7250805..b591636802d 100644 --- a/lib/ansible/modules/dpkg_selections.py +++ b/lib/ansible/modules/dpkg_selections.py @@ -3,8 +3,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/expect.py b/lib/ansible/modules/expect.py index 921aa70a447..7025ed32369 100644 --- a/lib/ansible/modules/expect.py +++ b/lib/ansible/modules/expect.py @@ -3,8 +3,7 @@ # (c) 2015, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/fail.py b/lib/ansible/modules/fail.py index 8d3fa153c02..e7a057e3fe1 100644 --- a/lib/ansible/modules/fail.py +++ b/lib/ansible/modules/fail.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Dag Wieers # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/fetch.py b/lib/ansible/modules/fetch.py index 77ebd190409..66726e3ae39 100644 --- a/lib/ansible/modules/fetch.py +++ b/lib/ansible/modules/fetch.py @@ -5,8 +5,7 @@ # This is a virtual module that is entirely implemented as an action plugin and runs on the controller -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/file.py b/lib/ansible/modules/file.py index 6d30047f52c..564d7f6cdbe 100644 --- a/lib/ansible/modules/file.py +++ b/lib/ansible/modules/file.py @@ -4,8 +4,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/find.py b/lib/ansible/modules/find.py index d2e6c8bc051..61c71813e7c 100644 --- a/lib/ansible/modules/find.py +++ b/lib/ansible/modules/find.py @@ -6,8 +6,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/gather_facts.py b/lib/ansible/modules/gather_facts.py index 123001b05ef..561275f2844 100644 --- a/lib/ansible/modules/gather_facts.py +++ b/lib/ansible/modules/gather_facts.py @@ -2,8 +2,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/get_url.py b/lib/ansible/modules/get_url.py index 55ea49272e3..920b986b580 100644 --- a/lib/ansible/modules/get_url.py +++ b/lib/ansible/modules/get_url.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Jan-Piet Mens # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/getent.py b/lib/ansible/modules/getent.py index 5487354bda5..0db0cacf280 100644 --- a/lib/ansible/modules/getent.py +++ b/lib/ansible/modules/getent.py @@ -3,8 +3,7 @@ # Copyright: (c) 2014, Brian Coca # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/git.py b/lib/ansible/modules/git.py index 681708e6a62..f40e43f30a5 100644 --- a/lib/ansible/modules/git.py +++ b/lib/ansible/modules/git.py @@ -3,8 +3,7 @@ # (c) 2012, Michael DeHaan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/group.py b/lib/ansible/modules/group.py index 45590d1dfac..100d211584c 100644 --- a/lib/ansible/modules/group.py +++ b/lib/ansible/modules/group.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Stephen Fromm # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/group_by.py b/lib/ansible/modules/group_by.py index 0d1e0c8e884..6efe8001514 100644 --- a/lib/ansible/modules/group_by.py +++ b/lib/ansible/modules/group_by.py @@ -4,8 +4,7 @@ # Copyright: Ansible Team # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/hostname.py b/lib/ansible/modules/hostname.py index 4a1c7ead661..520632e2657 100644 --- a/lib/ansible/modules/hostname.py +++ b/lib/ansible/modules/hostname.py @@ -4,8 +4,7 @@ # Copyright: (c) 2013, Hiroaki Nakamura # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/import_playbook.py b/lib/ansible/modules/import_playbook.py index 9adaebf363f..4b56467a6e7 100644 --- a/lib/ansible/modules/import_playbook.py +++ b/lib/ansible/modules/import_playbook.py @@ -3,8 +3,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/import_role.py b/lib/ansible/modules/import_role.py index bc1fd4d2a98..7646cf498b7 100644 --- a/lib/ansible/modules/import_role.py +++ b/lib/ansible/modules/import_role.py @@ -2,8 +2,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/import_tasks.py b/lib/ansible/modules/import_tasks.py index e57862066d0..37eb0613d81 100644 --- a/lib/ansible/modules/import_tasks.py +++ b/lib/ansible/modules/import_tasks.py @@ -3,8 +3,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/include_role.py b/lib/ansible/modules/include_role.py index c0e24ae190c..ebdac9a40c7 100644 --- a/lib/ansible/modules/include_role.py +++ b/lib/ansible/modules/include_role.py @@ -3,8 +3,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/include_tasks.py b/lib/ansible/modules/include_tasks.py index d89950a950a..914d4b34fe7 100644 --- a/lib/ansible/modules/include_tasks.py +++ b/lib/ansible/modules/include_tasks.py @@ -3,8 +3,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/include_vars.py b/lib/ansible/modules/include_vars.py index 3752ca65701..99e77cb5faa 100644 --- a/lib/ansible/modules/include_vars.py +++ b/lib/ansible/modules/include_vars.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/iptables.py b/lib/ansible/modules/iptables.py index 8b9a46a1166..96d93a8dac3 100644 --- a/lib/ansible/modules/iptables.py +++ b/lib/ansible/modules/iptables.py @@ -4,8 +4,7 @@ # Copyright: (c) 2017, Sébastien DA ROCHA # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/known_hosts.py b/lib/ansible/modules/known_hosts.py index 0c97ce2e0b1..b742384fdbd 100644 --- a/lib/ansible/modules/known_hosts.py +++ b/lib/ansible/modules/known_hosts.py @@ -2,8 +2,7 @@ # Copyright: (c) 2014, Matthew Vernon # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/lineinfile.py b/lib/ansible/modules/lineinfile.py index 3d8d85dc53a..34569df8ece 100644 --- a/lib/ansible/modules/lineinfile.py +++ b/lib/ansible/modules/lineinfile.py @@ -5,8 +5,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/meta.py b/lib/ansible/modules/meta.py index 78c3928ba19..d17b70008a6 100644 --- a/lib/ansible/modules/meta.py +++ b/lib/ansible/modules/meta.py @@ -3,8 +3,7 @@ # Copyright: (c) 2016, Ansible, a Red Hat company # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/package.py b/lib/ansible/modules/package.py index 5541635855f..d04eb25e5c6 100644 --- a/lib/ansible/modules/package.py +++ b/lib/ansible/modules/package.py @@ -4,8 +4,7 @@ # # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/package_facts.py b/lib/ansible/modules/package_facts.py index cc6fafad131..11a8f61fdb0 100644 --- a/lib/ansible/modules/package_facts.py +++ b/lib/ansible/modules/package_facts.py @@ -3,8 +3,7 @@ # most of it copied from AWX's scan_packages module -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/pause.py b/lib/ansible/modules/pause.py index ed9b97ad187..278e84c2855 100644 --- a/lib/ansible/modules/pause.py +++ b/lib/ansible/modules/pause.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/ping.py b/lib/ansible/modules/ping.py index c72479806fa..a29e1442b81 100644 --- a/lib/ansible/modules/ping.py +++ b/lib/ansible/modules/ping.py @@ -4,8 +4,7 @@ # (c) 2016, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/pip.py b/lib/ansible/modules/pip.py index fa105bbef21..aec18570f85 100644 --- a/lib/ansible/modules/pip.py +++ b/lib/ansible/modules/pip.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Matt Wright # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/raw.py b/lib/ansible/modules/raw.py index 60840d044a1..75ff754ca12 100644 --- a/lib/ansible/modules/raw.py +++ b/lib/ansible/modules/raw.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/reboot.py b/lib/ansible/modules/reboot.py index f4d029b68b6..6d8dbd6feb1 100644 --- a/lib/ansible/modules/reboot.py +++ b/lib/ansible/modules/reboot.py @@ -2,8 +2,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/replace.py b/lib/ansible/modules/replace.py index fe4cdf0272d..7a2414e1438 100644 --- a/lib/ansible/modules/replace.py +++ b/lib/ansible/modules/replace.py @@ -4,8 +4,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/rpm_key.py b/lib/ansible/modules/rpm_key.py index 9c46e43e50e..98a10458ea4 100644 --- a/lib/ansible/modules/rpm_key.py +++ b/lib/ansible/modules/rpm_key.py @@ -5,8 +5,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/script.py b/lib/ansible/modules/script.py index c96da0f6f34..0705c891bbc 100644 --- a/lib/ansible/modules/script.py +++ b/lib/ansible/modules/script.py @@ -1,8 +1,7 @@ # Copyright: (c) 2012, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/service.py b/lib/ansible/modules/service.py index b562f53d036..9dce857aff1 100644 --- a/lib/ansible/modules/service.py +++ b/lib/ansible/modules/service.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Michael DeHaan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/service_facts.py b/lib/ansible/modules/service_facts.py index 85d6250d187..d04d4da5cff 100644 --- a/lib/ansible/modules/service_facts.py +++ b/lib/ansible/modules/service_facts.py @@ -3,8 +3,7 @@ # originally copied from AWX's scan_services module to bring this functionality # into Core -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/set_fact.py b/lib/ansible/modules/set_fact.py index 7fa0cf9d446..c9ab09bb11f 100644 --- a/lib/ansible/modules/set_fact.py +++ b/lib/ansible/modules/set_fact.py @@ -3,8 +3,7 @@ # Copyright: (c) 2013, Dag Wieers (@dagwieers) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/set_stats.py b/lib/ansible/modules/set_stats.py index 5b11c3652d9..4526d7bd3df 100644 --- a/lib/ansible/modules/set_stats.py +++ b/lib/ansible/modules/set_stats.py @@ -3,8 +3,7 @@ # Copyright: (c) 2016, Ansible RedHat, Inc # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/setup.py b/lib/ansible/modules/setup.py index 0615f5efe8a..d387022fda5 100644 --- a/lib/ansible/modules/setup.py +++ b/lib/ansible/modules/setup.py @@ -3,8 +3,7 @@ # (c) 2012, Michael DeHaan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/shell.py b/lib/ansible/modules/shell.py index cd403b7c38d..5cedd625252 100644 --- a/lib/ansible/modules/shell.py +++ b/lib/ansible/modules/shell.py @@ -7,8 +7,7 @@ # it runs the 'command' module with special arguments and it behaves differently. # See the command source and the comment "#USE_SHELL". -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/slurp.py b/lib/ansible/modules/slurp.py index f04f3d7a7e5..e9a65471a3f 100644 --- a/lib/ansible/modules/slurp.py +++ b/lib/ansible/modules/slurp.py @@ -3,8 +3,7 @@ # (c) 2012, Michael DeHaan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/stat.py b/lib/ansible/modules/stat.py index ee29251b005..039d2b2ac4c 100644 --- a/lib/ansible/modules/stat.py +++ b/lib/ansible/modules/stat.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/subversion.py b/lib/ansible/modules/subversion.py index 847431eb5ec..8d8a979220e 100644 --- a/lib/ansible/modules/subversion.py +++ b/lib/ansible/modules/subversion.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Michael DeHaan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/systemd_service.py b/lib/ansible/modules/systemd_service.py index 8b3b4306772..7ab30bc98fa 100644 --- a/lib/ansible/modules/systemd_service.py +++ b/lib/ansible/modules/systemd_service.py @@ -3,8 +3,7 @@ # Copyright: (c) 2016, Brian Coca # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/sysvinit.py b/lib/ansible/modules/sysvinit.py index fc934d35887..76f2a203cda 100644 --- a/lib/ansible/modules/sysvinit.py +++ b/lib/ansible/modules/sysvinit.py @@ -4,8 +4,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/tempfile.py b/lib/ansible/modules/tempfile.py index c5fedabe8a1..bf0c5077f97 100644 --- a/lib/ansible/modules/tempfile.py +++ b/lib/ansible/modules/tempfile.py @@ -4,8 +4,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/template.py b/lib/ansible/modules/template.py index 8f8ad0bd713..a6800390c80 100644 --- a/lib/ansible/modules/template.py +++ b/lib/ansible/modules/template.py @@ -5,8 +5,7 @@ # This is a virtual module that is entirely implemented as an action plugin and runs on the controller -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/unarchive.py b/lib/ansible/modules/unarchive.py index ec15a5717af..7d83b9fbb2a 100644 --- a/lib/ansible/modules/unarchive.py +++ b/lib/ansible/modules/unarchive.py @@ -7,8 +7,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/uri.py b/lib/ansible/modules/uri.py index 0aac9788c8b..4dbfa7a9b6e 100644 --- a/lib/ansible/modules/uri.py +++ b/lib/ansible/modules/uri.py @@ -3,8 +3,7 @@ # Copyright: (c) 2013, Romeo Theriault # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/user.py b/lib/ansible/modules/user.py index 6d465b04d07..0ad20e4890c 100644 --- a/lib/ansible/modules/user.py +++ b/lib/ansible/modules/user.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Stephen Fromm # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/validate_argument_spec.py b/lib/ansible/modules/validate_argument_spec.py index 0186c0af7bf..b662e377c96 100644 --- a/lib/ansible/modules/validate_argument_spec.py +++ b/lib/ansible/modules/validate_argument_spec.py @@ -3,8 +3,7 @@ # Copyright 2021 Red Hat # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/wait_for.py b/lib/ansible/modules/wait_for.py index a4ce39471fb..907c78e9d05 100644 --- a/lib/ansible/modules/wait_for.py +++ b/lib/ansible/modules/wait_for.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Jeroen Hoekx # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/wait_for_connection.py b/lib/ansible/modules/wait_for_connection.py index f104722feac..45be7be6101 100644 --- a/lib/ansible/modules/wait_for_connection.py +++ b/lib/ansible/modules/wait_for_connection.py @@ -3,8 +3,7 @@ # Copyright: (c) 2017, Dag Wieers (@dagwieers) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/lib/ansible/modules/yum.py b/lib/ansible/modules/yum.py index 095f5517b7e..cbcf4b954f2 100644 --- a/lib/ansible/modules/yum.py +++ b/lib/ansible/modules/yum.py @@ -6,8 +6,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/modules/yum_repository.py b/lib/ansible/modules/yum_repository.py index e012951622b..9f2bcd2a066 100644 --- a/lib/ansible/modules/yum_repository.py +++ b/lib/ansible/modules/yum_repository.py @@ -4,8 +4,7 @@ # # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/lib/ansible/parsing/__init__.py b/lib/ansible/parsing/__init__.py index 28634b1b3f4..298ee81aa56 100644 --- a/lib/ansible/parsing/__init__.py +++ b/lib/ansible/parsing/__init__.py @@ -15,6 +15,4 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations diff --git a/lib/ansible/parsing/ajson.py b/lib/ansible/parsing/ajson.py index 48242271516..ff29240afc1 100644 --- a/lib/ansible/parsing/ajson.py +++ b/lib/ansible/parsing/ajson.py @@ -1,9 +1,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/lib/ansible/parsing/dataloader.py b/lib/ansible/parsing/dataloader.py index 13a57e41973..db695ba8dd4 100644 --- a/lib/ansible/parsing/dataloader.py +++ b/lib/ansible/parsing/dataloader.py @@ -2,9 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import copy import os diff --git a/lib/ansible/parsing/mod_args.py b/lib/ansible/parsing/mod_args.py index ebdca498a8c..9da6f83e211 100644 --- a/lib/ansible/parsing/mod_args.py +++ b/lib/ansible/parsing/mod_args.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.constants as C from ansible.errors import AnsibleParserError, AnsibleError, AnsibleAssertionError diff --git a/lib/ansible/parsing/plugin_docs.py b/lib/ansible/parsing/plugin_docs.py index 253f62af68e..8b12086b8ca 100644 --- a/lib/ansible/parsing/plugin_docs.py +++ b/lib/ansible/parsing/plugin_docs.py @@ -1,8 +1,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ast import tokenize diff --git a/lib/ansible/parsing/quoting.py b/lib/ansible/parsing/quoting.py index d3a38d946ca..45e7fcbde92 100644 --- a/lib/ansible/parsing/quoting.py +++ b/lib/ansible/parsing/quoting.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def is_quoted(data): diff --git a/lib/ansible/parsing/splitter.py b/lib/ansible/parsing/splitter.py index bed10c18f6e..a67524f4ad1 100644 --- a/lib/ansible/parsing/splitter.py +++ b/lib/ansible/parsing/splitter.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import codecs import re diff --git a/lib/ansible/parsing/utils/__init__.py b/lib/ansible/parsing/utils/__init__.py index ae8ccff5952..64fee52484f 100644 --- a/lib/ansible/parsing/utils/__init__.py +++ b/lib/ansible/parsing/utils/__init__.py @@ -15,6 +15,4 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations diff --git a/lib/ansible/parsing/utils/addresses.py b/lib/ansible/parsing/utils/addresses.py index 0096af441e2..f15aae1ba9c 100644 --- a/lib/ansible/parsing/utils/addresses.py +++ b/lib/ansible/parsing/utils/addresses.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re from ansible.errors import AnsibleParserError, AnsibleError diff --git a/lib/ansible/parsing/utils/jsonify.py b/lib/ansible/parsing/utils/jsonify.py index 19ebc5653ba..3be931c1f3e 100644 --- a/lib/ansible/parsing/utils/jsonify.py +++ b/lib/ansible/parsing/utils/jsonify.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/lib/ansible/parsing/utils/yaml.py b/lib/ansible/parsing/utils/yaml.py index d67b91f590f..98a9f94ff73 100644 --- a/lib/ansible/parsing/utils/yaml.py +++ b/lib/ansible/parsing/utils/yaml.py @@ -3,9 +3,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/lib/ansible/parsing/vault/__init__.py b/lib/ansible/parsing/vault/__init__.py index b3b1c5a4411..432609d14f9 100644 --- a/lib/ansible/parsing/vault/__init__.py +++ b/lib/ansible/parsing/vault/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import errno import fcntl diff --git a/lib/ansible/parsing/yaml/__init__.py b/lib/ansible/parsing/yaml/__init__.py index ae8ccff5952..64fee52484f 100644 --- a/lib/ansible/parsing/yaml/__init__.py +++ b/lib/ansible/parsing/yaml/__init__.py @@ -15,6 +15,4 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations diff --git a/lib/ansible/parsing/yaml/constructor.py b/lib/ansible/parsing/yaml/constructor.py index e97c02dd884..4f1cdfe2e6e 100644 --- a/lib/ansible/parsing/yaml/constructor.py +++ b/lib/ansible/parsing/yaml/constructor.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from yaml.constructor import SafeConstructor, ConstructorError from yaml.nodes import MappingNode diff --git a/lib/ansible/parsing/yaml/dumper.py b/lib/ansible/parsing/yaml/dumper.py index 8701bb81968..11a1431b94f 100644 --- a/lib/ansible/parsing/yaml/dumper.py +++ b/lib/ansible/parsing/yaml/dumper.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import yaml diff --git a/lib/ansible/parsing/yaml/loader.py b/lib/ansible/parsing/yaml/loader.py index 15bde79aab0..b9bd3e1c6e3 100644 --- a/lib/ansible/parsing/yaml/loader.py +++ b/lib/ansible/parsing/yaml/loader.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from yaml.resolver import Resolver diff --git a/lib/ansible/parsing/yaml/objects.py b/lib/ansible/parsing/yaml/objects.py index 118f2f358d0..b6a8e9a5681 100644 --- a/lib/ansible/parsing/yaml/objects.py +++ b/lib/ansible/parsing/yaml/objects.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys as _sys diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py index 52b2ee7f367..e125df1ba9a 100644 --- a/lib/ansible/playbook/__init__.py +++ b/lib/ansible/playbook/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/playbook/attribute.py b/lib/ansible/playbook/attribute.py index 73e73ab029e..bf3975548ab 100644 --- a/lib/ansible/playbook/attribute.py +++ b/lib/ansible/playbook/attribute.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.utils.sentinel import Sentinel diff --git a/lib/ansible/playbook/base.py b/lib/ansible/playbook/base.py index d08b826772b..72537292f59 100644 --- a/lib/ansible/playbook/base.py +++ b/lib/ansible/playbook/base.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import itertools import operator diff --git a/lib/ansible/playbook/block.py b/lib/ansible/playbook/block.py index e585fb7de93..9c82ed27900 100644 --- a/lib/ansible/playbook/block.py +++ b/lib/ansible/playbook/block.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.constants as C from ansible.errors import AnsibleParserError diff --git a/lib/ansible/playbook/collectionsearch.py b/lib/ansible/playbook/collectionsearch.py index 2980093633c..c6ab50907bf 100644 --- a/lib/ansible/playbook/collectionsearch.py +++ b/lib/ansible/playbook/collectionsearch.py @@ -1,8 +1,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.six import string_types from ansible.playbook.attribute import FieldAttribute diff --git a/lib/ansible/playbook/conditional.py b/lib/ansible/playbook/conditional.py index 4bb8ef22afa..43cf99f297d 100644 --- a/lib/ansible/playbook/conditional.py +++ b/lib/ansible/playbook/conditional.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import typing as t diff --git a/lib/ansible/playbook/delegatable.py b/lib/ansible/playbook/delegatable.py index 2d9d16ea7cf..ce2f02577f5 100644 --- a/lib/ansible/playbook/delegatable.py +++ b/lib/ansible/playbook/delegatable.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Copyright The Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations from ansible.playbook.attribute import FieldAttribute diff --git a/lib/ansible/playbook/handler.py b/lib/ansible/playbook/handler.py index 2f2839813a7..c7ce2bc4a51 100644 --- a/lib/ansible/playbook/handler.py +++ b/lib/ansible/playbook/handler.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.playbook.attribute import NonInheritableFieldAttribute from ansible.playbook.task import Task diff --git a/lib/ansible/playbook/handler_task_include.py b/lib/ansible/playbook/handler_task_include.py index 1c779f85d82..2a0388191c9 100644 --- a/lib/ansible/playbook/handler_task_include.py +++ b/lib/ansible/playbook/handler_task_include.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # from ansible.inventory.host import Host from ansible.playbook.handler import Handler diff --git a/lib/ansible/playbook/helpers.py b/lib/ansible/playbook/helpers.py index 903dcdf419d..b908a0f9722 100644 --- a/lib/ansible/playbook/helpers.py +++ b/lib/ansible/playbook/helpers.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/playbook/included_file.py b/lib/ansible/playbook/included_file.py index 375074435ca..177900f653e 100644 --- a/lib/ansible/playbook/included_file.py +++ b/lib/ansible/playbook/included_file.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/playbook/loop_control.py b/lib/ansible/playbook/loop_control.py index 4df0a73ffe7..8581b1f8b45 100644 --- a/lib/ansible/playbook/loop_control.py +++ b/lib/ansible/playbook/loop_control.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.playbook.attribute import NonInheritableFieldAttribute from ansible.playbook.base import FieldAttributeBase diff --git a/lib/ansible/playbook/notifiable.py b/lib/ansible/playbook/notifiable.py index a183293d564..c66cc944d57 100644 --- a/lib/ansible/playbook/notifiable.py +++ b/lib/ansible/playbook/notifiable.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Copyright The Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations from ansible.playbook.attribute import FieldAttribute diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index 64498596599..3331a505f22 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible import constants as C from ansible import context diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py index d9bb040ed0e..e5aa976f413 100644 --- a/lib/ansible/playbook/play_context.py +++ b/lib/ansible/playbook/play_context.py @@ -17,9 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible import constants as C from ansible import context diff --git a/lib/ansible/playbook/playbook_include.py b/lib/ansible/playbook/playbook_include.py index 2579a8acf75..613f93995aa 100644 --- a/lib/ansible/playbook/playbook_include.py +++ b/lib/ansible/playbook/playbook_include.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/playbook/role/__init__.py b/lib/ansible/playbook/role/__init__.py index 31e63097295..04256898cee 100644 --- a/lib/ansible/playbook/role/__init__.py +++ b/lib/ansible/playbook/role/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/playbook/role/definition.py b/lib/ansible/playbook/role/definition.py index f7ca3a85d9f..12d6ce182c8 100644 --- a/lib/ansible/playbook/role/definition.py +++ b/lib/ansible/playbook/role/definition.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/playbook/role/include.py b/lib/ansible/playbook/role/include.py index f4b3e402911..934b53ce9b4 100644 --- a/lib/ansible/playbook/role/include.py +++ b/lib/ansible/playbook/role/include.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleError, AnsibleParserError from ansible.module_utils.six import string_types diff --git a/lib/ansible/playbook/role/metadata.py b/lib/ansible/playbook/role/metadata.py index e299122e9aa..482539a75d6 100644 --- a/lib/ansible/playbook/role/metadata.py +++ b/lib/ansible/playbook/role/metadata.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/playbook/role/requirement.py b/lib/ansible/playbook/role/requirement.py index 59e9cf39579..d68f686e013 100644 --- a/lib/ansible/playbook/role/requirement.py +++ b/lib/ansible/playbook/role/requirement.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleError from ansible.module_utils.six import string_types diff --git a/lib/ansible/playbook/role_include.py b/lib/ansible/playbook/role_include.py index 7f0948763ad..b2460b6c7da 100644 --- a/lib/ansible/playbook/role_include.py +++ b/lib/ansible/playbook/role_include.py @@ -14,9 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from os.path import basename diff --git a/lib/ansible/playbook/taggable.py b/lib/ansible/playbook/taggable.py index 828c7b2e5a1..fa1d5b203f3 100644 --- a/lib/ansible/playbook/taggable.py +++ b/lib/ansible/playbook/taggable.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleError from ansible.module_utils.six import string_types diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py index 8c80fdfe633..86b829ed909 100644 --- a/lib/ansible/playbook/task.py +++ b/lib/ansible/playbook/task.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible import constants as C from ansible.errors import AnsibleError, AnsibleParserError, AnsibleUndefinedVariable, AnsibleAssertionError diff --git a/lib/ansible/playbook/task_include.py b/lib/ansible/playbook/task_include.py index fc0988987a2..1ace5fdebe1 100644 --- a/lib/ansible/playbook/task_include.py +++ b/lib/ansible/playbook/task_include.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.constants as C from ansible.errors import AnsibleParserError diff --git a/lib/ansible/plugins/__init__.py b/lib/ansible/plugins/__init__.py index 0333361fbfc..90452dff3e0 100644 --- a/lib/ansible/plugins/__init__.py +++ b/lib/ansible/plugins/__init__.py @@ -17,9 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from abc import ABC diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index 5ba3bd78bb2..cd931115e64 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -3,9 +3,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import base64 import json diff --git a/lib/ansible/plugins/action/add_host.py b/lib/ansible/plugins/action/add_host.py index ede2e05f91a..25fa2cd5c51 100644 --- a/lib/ansible/plugins/action/add_host.py +++ b/lib/ansible/plugins/action/add_host.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import Mapping diff --git a/lib/ansible/plugins/action/assemble.py b/lib/ansible/plugins/action/assemble.py index da794edd27c..7998de041aa 100644 --- a/lib/ansible/plugins/action/assemble.py +++ b/lib/ansible/plugins/action/assemble.py @@ -16,8 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import codecs import os diff --git a/lib/ansible/plugins/action/assert.py b/lib/ansible/plugins/action/assert.py index 139d2eb848c..578320cf5ad 100644 --- a/lib/ansible/plugins/action/assert.py +++ b/lib/ansible/plugins/action/assert.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleError from ansible.playbook.conditional import Conditional diff --git a/lib/ansible/plugins/action/async_status.py b/lib/ansible/plugins/action/async_status.py index 4f50fe62f8e..a0fe11eb59d 100644 --- a/lib/ansible/plugins/action/async_status.py +++ b/lib/ansible/plugins/action/async_status.py @@ -1,8 +1,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase from ansible.utils.vars import merge_hash diff --git a/lib/ansible/plugins/action/command.py b/lib/ansible/plugins/action/command.py index 64e1a094011..df4dbe9f7c6 100644 --- a/lib/ansible/plugins/action/command.py +++ b/lib/ansible/plugins/action/command.py @@ -1,8 +1,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase from ansible.utils.vars import merge_hash diff --git a/lib/ansible/plugins/action/copy.py b/lib/ansible/plugins/action/copy.py index 048f98ddbd0..47bcd7a13e3 100644 --- a/lib/ansible/plugins/action/copy.py +++ b/lib/ansible/plugins/action/copy.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/lib/ansible/plugins/action/debug.py b/lib/ansible/plugins/action/debug.py index 9e23c5fa560..579ffcef64c 100644 --- a/lib/ansible/plugins/action/debug.py +++ b/lib/ansible/plugins/action/debug.py @@ -15,8 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleUndefinedVariable from ansible.module_utils.six import string_types diff --git a/lib/ansible/plugins/action/dnf.py b/lib/ansible/plugins/action/dnf.py index bf8ac3f46ac..7658a0e6d62 100644 --- a/lib/ansible/plugins/action/dnf.py +++ b/lib/ansible/plugins/action/dnf.py @@ -1,5 +1,6 @@ # Copyright: (c) 2023, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations from ansible.errors import AnsibleActionFail from ansible.plugins.action import ActionBase diff --git a/lib/ansible/plugins/action/fail.py b/lib/ansible/plugins/action/fail.py index dedfc8c45f9..998d8a9244a 100644 --- a/lib/ansible/plugins/action/fail.py +++ b/lib/ansible/plugins/action/fail.py @@ -15,8 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/lib/ansible/plugins/action/fetch.py b/lib/ansible/plugins/action/fetch.py index 11c91eb26ee..d89ff264b74 100644 --- a/lib/ansible/plugins/action/fetch.py +++ b/lib/ansible/plugins/action/fetch.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import base64 diff --git a/lib/ansible/plugins/action/gather_facts.py b/lib/ansible/plugins/action/gather_facts.py index 23962c833c7..c4aa0ec83c9 100644 --- a/lib/ansible/plugins/action/gather_facts.py +++ b/lib/ansible/plugins/action/gather_facts.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import time diff --git a/lib/ansible/plugins/action/group_by.py b/lib/ansible/plugins/action/group_by.py index e0c70231233..369e89b79f1 100644 --- a/lib/ansible/plugins/action/group_by.py +++ b/lib/ansible/plugins/action/group_by.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase from ansible.module_utils.six import string_types diff --git a/lib/ansible/plugins/action/include_vars.py b/lib/ansible/plugins/action/include_vars.py index bff29851344..14913b5e655 100644 --- a/lib/ansible/plugins/action/include_vars.py +++ b/lib/ansible/plugins/action/include_vars.py @@ -1,8 +1,7 @@ # Copyright: (c) 2016, Allen Sanabria # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from os import path, walk import re diff --git a/lib/ansible/plugins/action/normal.py b/lib/ansible/plugins/action/normal.py index b2212e62f59..0476f9aacdf 100644 --- a/lib/ansible/plugins/action/normal.py +++ b/lib/ansible/plugins/action/normal.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible import constants as C from ansible.plugins.action import ActionBase diff --git a/lib/ansible/plugins/action/package.py b/lib/ansible/plugins/action/package.py index 6c436596e0f..e4f91fd8c52 100644 --- a/lib/ansible/plugins/action/package.py +++ b/lib/ansible/plugins/action/package.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleAction, AnsibleActionFail from ansible.executor.module_common import get_action_args_with_defaults diff --git a/lib/ansible/plugins/action/pause.py b/lib/ansible/plugins/action/pause.py index d306fbfa82c..d603579fe1c 100644 --- a/lib/ansible/plugins/action/pause.py +++ b/lib/ansible/plugins/action/pause.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import datetime import time diff --git a/lib/ansible/plugins/action/raw.py b/lib/ansible/plugins/action/raw.py index b82ed34037e..7b4d461e750 100644 --- a/lib/ansible/plugins/action/raw.py +++ b/lib/ansible/plugins/action/raw.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/lib/ansible/plugins/action/reboot.py b/lib/ansible/plugins/action/reboot.py index c75fba8e6fd..e4b42ecde4f 100644 --- a/lib/ansible/plugins/action/reboot.py +++ b/lib/ansible/plugins/action/reboot.py @@ -2,8 +2,7 @@ # Copyright: (c) 2018, Sam Doran # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import random import time diff --git a/lib/ansible/plugins/action/script.py b/lib/ansible/plugins/action/script.py index e6ebd094167..494002c4be8 100644 --- a/lib/ansible/plugins/action/script.py +++ b/lib/ansible/plugins/action/script.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import re diff --git a/lib/ansible/plugins/action/service.py b/lib/ansible/plugins/action/service.py index c061687e556..90b07803060 100644 --- a/lib/ansible/plugins/action/service.py +++ b/lib/ansible/plugins/action/service.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleAction, AnsibleActionFail diff --git a/lib/ansible/plugins/action/set_fact.py b/lib/ansible/plugins/action/set_fact.py index ee3ceb28251..b95ec4940f9 100644 --- a/lib/ansible/plugins/action/set_fact.py +++ b/lib/ansible/plugins/action/set_fact.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleActionFail from ansible.module_utils.six import string_types diff --git a/lib/ansible/plugins/action/set_stats.py b/lib/ansible/plugins/action/set_stats.py index 5c4f005539e..309180f7a3d 100644 --- a/lib/ansible/plugins/action/set_stats.py +++ b/lib/ansible/plugins/action/set_stats.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.parsing.convert_bool import boolean from ansible.plugins.action import ActionBase diff --git a/lib/ansible/plugins/action/shell.py b/lib/ansible/plugins/action/shell.py index dd4df461cda..1b4fbc00e5c 100644 --- a/lib/ansible/plugins/action/shell.py +++ b/lib/ansible/plugins/action/shell.py @@ -1,8 +1,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleActionFail from ansible.plugins.action import ActionBase diff --git a/lib/ansible/plugins/action/template.py b/lib/ansible/plugins/action/template.py index 4bfd967053b..c1cb67302df 100644 --- a/lib/ansible/plugins/action/template.py +++ b/lib/ansible/plugins/action/template.py @@ -2,8 +2,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import shutil diff --git a/lib/ansible/plugins/action/unarchive.py b/lib/ansible/plugins/action/unarchive.py index 9bce1227e03..bcc152d44ca 100644 --- a/lib/ansible/plugins/action/unarchive.py +++ b/lib/ansible/plugins/action/unarchive.py @@ -15,8 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/plugins/action/uri.py b/lib/ansible/plugins/action/uri.py index ffd1c89a24e..138269d3269 100644 --- a/lib/ansible/plugins/action/uri.py +++ b/lib/ansible/plugins/action/uri.py @@ -3,9 +3,7 @@ # (c) 2018, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/plugins/action/validate_argument_spec.py b/lib/ansible/plugins/action/validate_argument_spec.py index b2c1d7b586f..4d68067a343 100644 --- a/lib/ansible/plugins/action/validate_argument_spec.py +++ b/lib/ansible/plugins/action/validate_argument_spec.py @@ -1,8 +1,7 @@ # Copyright 2021 Red Hat # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleError from ansible.plugins.action import ActionBase diff --git a/lib/ansible/plugins/action/wait_for_connection.py b/lib/ansible/plugins/action/wait_for_connection.py index df549d9449f..533f93cb5d3 100644 --- a/lib/ansible/plugins/action/wait_for_connection.py +++ b/lib/ansible/plugins/action/wait_for_connection.py @@ -16,8 +16,7 @@ # along with Ansible. If not, see . # CI-required python3 boilerplate -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import time from datetime import datetime, timedelta, timezone diff --git a/lib/ansible/plugins/action/yum.py b/lib/ansible/plugins/action/yum.py index 9121e8129da..d49b9c98f96 100644 --- a/lib/ansible/plugins/action/yum.py +++ b/lib/ansible/plugins/action/yum.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleActionFail from ansible.plugins.action import ActionBase diff --git a/lib/ansible/plugins/become/__init__.py b/lib/ansible/plugins/become/__init__.py index 0e4a4118360..0ac15123f8c 100644 --- a/lib/ansible/plugins/become/__init__.py +++ b/lib/ansible/plugins/become/__init__.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import shlex diff --git a/lib/ansible/plugins/become/runas.py b/lib/ansible/plugins/become/runas.py index 0b7d466133d..3094c46c4b0 100644 --- a/lib/ansible/plugins/become/runas.py +++ b/lib/ansible/plugins/become/runas.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: runas diff --git a/lib/ansible/plugins/become/su.py b/lib/ansible/plugins/become/su.py index 7fa54135b71..ae2d39a5217 100644 --- a/lib/ansible/plugins/become/su.py +++ b/lib/ansible/plugins/become/su.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: su diff --git a/lib/ansible/plugins/become/sudo.py b/lib/ansible/plugins/become/sudo.py index fb285f00270..6a33c987c04 100644 --- a/lib/ansible/plugins/become/sudo.py +++ b/lib/ansible/plugins/become/sudo.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: sudo diff --git a/lib/ansible/plugins/cache/__init__.py b/lib/ansible/plugins/cache/__init__.py index f3abcb70a2c..dc65b4c22a1 100644 --- a/lib/ansible/plugins/cache/__init__.py +++ b/lib/ansible/plugins/cache/__init__.py @@ -15,8 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import copy import errno diff --git a/lib/ansible/plugins/cache/base.py b/lib/ansible/plugins/cache/base.py index a947eb72cc9..a7c7468b820 100644 --- a/lib/ansible/plugins/cache/base.py +++ b/lib/ansible/plugins/cache/base.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # moved actual classes to __init__ kept here for backward compat with 3rd parties from ansible.plugins.cache import BaseCacheModule, BaseFileCacheModule # pylint: disable=unused-import diff --git a/lib/ansible/plugins/cache/jsonfile.py b/lib/ansible/plugins/cache/jsonfile.py index a26828a401c..69fd828a622 100644 --- a/lib/ansible/plugins/cache/jsonfile.py +++ b/lib/ansible/plugins/cache/jsonfile.py @@ -2,9 +2,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: jsonfile diff --git a/lib/ansible/plugins/cache/memory.py b/lib/ansible/plugins/cache/memory.py index 59f97b6eeda..59991ac7aba 100644 --- a/lib/ansible/plugins/cache/memory.py +++ b/lib/ansible/plugins/cache/memory.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: memory diff --git a/lib/ansible/plugins/callback/__init__.py b/lib/ansible/plugins/callback/__init__.py index c812b231936..f6a647f4a98 100644 --- a/lib/ansible/plugins/callback/__init__.py +++ b/lib/ansible/plugins/callback/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import difflib import json diff --git a/lib/ansible/plugins/callback/default.py b/lib/ansible/plugins/callback/default.py index 54ef452f043..30247154921 100644 --- a/lib/ansible/plugins/callback/default.py +++ b/lib/ansible/plugins/callback/default.py @@ -2,8 +2,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: default diff --git a/lib/ansible/plugins/callback/junit.py b/lib/ansible/plugins/callback/junit.py index 92158ef2216..73db9d55da5 100644 --- a/lib/ansible/plugins/callback/junit.py +++ b/lib/ansible/plugins/callback/junit.py @@ -2,8 +2,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: junit diff --git a/lib/ansible/plugins/callback/minimal.py b/lib/ansible/plugins/callback/minimal.py index c4d713f5d30..e316d8fdfd6 100644 --- a/lib/ansible/plugins/callback/minimal.py +++ b/lib/ansible/plugins/callback/minimal.py @@ -2,9 +2,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: minimal diff --git a/lib/ansible/plugins/callback/oneline.py b/lib/ansible/plugins/callback/oneline.py index 556f21cdb01..3a5eb72fd88 100644 --- a/lib/ansible/plugins/callback/oneline.py +++ b/lib/ansible/plugins/callback/oneline.py @@ -2,9 +2,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: oneline diff --git a/lib/ansible/plugins/callback/tree.py b/lib/ansible/plugins/callback/tree.py index 52a5feeaae1..b7f85f0edc9 100644 --- a/lib/ansible/plugins/callback/tree.py +++ b/lib/ansible/plugins/callback/tree.py @@ -2,8 +2,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: tree diff --git a/lib/ansible/plugins/cliconf/__init__.py b/lib/ansible/plugins/cliconf/__init__.py index 3201057acef..9befd36f332 100644 --- a/lib/ansible/plugins/cliconf/__init__.py +++ b/lib/ansible/plugins/cliconf/__init__.py @@ -16,8 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from abc import abstractmethod from functools import wraps diff --git a/lib/ansible/plugins/connection/__init__.py b/lib/ansible/plugins/connection/__init__.py index d17e14283fd..e769770fe26 100644 --- a/lib/ansible/plugins/connection/__init__.py +++ b/lib/ansible/plugins/connection/__init__.py @@ -2,8 +2,7 @@ # (c) 2015 Toshio Kuratomi # (c) 2017, Peter Sprygada # (c) 2017 Ansible Project -from __future__ import (annotations, absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import collections.abc as c import fcntl diff --git a/lib/ansible/plugins/connection/local.py b/lib/ansible/plugins/connection/local.py index d6dccc70384..44af5829b30 100644 --- a/lib/ansible/plugins/connection/local.py +++ b/lib/ansible/plugins/connection/local.py @@ -2,8 +2,7 @@ # (c) 2015, 2017 Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (annotations, absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: local diff --git a/lib/ansible/plugins/connection/paramiko_ssh.py b/lib/ansible/plugins/connection/paramiko_ssh.py index 172dbda22b5..924208be6eb 100644 --- a/lib/ansible/plugins/connection/paramiko_ssh.py +++ b/lib/ansible/plugins/connection/paramiko_ssh.py @@ -1,8 +1,7 @@ # (c) 2012, Michael DeHaan # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (annotations, absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ author: Ansible Core Team diff --git a/lib/ansible/plugins/connection/psrp.py b/lib/ansible/plugins/connection/psrp.py index 37a4694a634..60805e9377f 100644 --- a/lib/ansible/plugins/connection/psrp.py +++ b/lib/ansible/plugins/connection/psrp.py @@ -1,8 +1,7 @@ # Copyright (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (annotations, absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ author: Ansible Core Team diff --git a/lib/ansible/plugins/connection/ssh.py b/lib/ansible/plugins/connection/ssh.py index 49b2ed22fcb..7d6513aac9b 100644 --- a/lib/ansible/plugins/connection/ssh.py +++ b/lib/ansible/plugins/connection/ssh.py @@ -4,8 +4,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (annotations, absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: ssh diff --git a/lib/ansible/plugins/connection/winrm.py b/lib/ansible/plugins/connection/winrm.py index 11f05149411..484a1b21e07 100644 --- a/lib/ansible/plugins/connection/winrm.py +++ b/lib/ansible/plugins/connection/winrm.py @@ -2,8 +2,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (annotations, absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ author: Ansible Core Team diff --git a/lib/ansible/plugins/doc_fragments/action_common_attributes.py b/lib/ansible/plugins/doc_fragments/action_common_attributes.py index c135df5ec15..47d9534c1d3 100644 --- a/lib/ansible/plugins/doc_fragments/action_common_attributes.py +++ b/lib/ansible/plugins/doc_fragments/action_common_attributes.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/action_core.py b/lib/ansible/plugins/doc_fragments/action_core.py index 891cb049250..820c4a52d39 100644 --- a/lib/ansible/plugins/doc_fragments/action_core.py +++ b/lib/ansible/plugins/doc_fragments/action_core.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Copyright: (c) , Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # WARNING: this is mostly here as a convinence for documenting core behaviours, no plugin outside of ansible-core should use this file diff --git a/lib/ansible/plugins/doc_fragments/backup.py b/lib/ansible/plugins/doc_fragments/backup.py index d2e76dc1929..037df249bbf 100644 --- a/lib/ansible/plugins/doc_fragments/backup.py +++ b/lib/ansible/plugins/doc_fragments/backup.py @@ -2,8 +2,7 @@ # Copyright: (c) 2015, Ansible, Inc # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/connection_pipelining.py b/lib/ansible/plugins/doc_fragments/connection_pipelining.py index fa18265832d..a590be3ebb8 100644 --- a/lib/ansible/plugins/doc_fragments/connection_pipelining.py +++ b/lib/ansible/plugins/doc_fragments/connection_pipelining.py @@ -1,7 +1,6 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/constructed.py b/lib/ansible/plugins/doc_fragments/constructed.py index 8e4504338b7..c5d7e0ac8bf 100644 --- a/lib/ansible/plugins/doc_fragments/constructed.py +++ b/lib/ansible/plugins/doc_fragments/constructed.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/decrypt.py b/lib/ansible/plugins/doc_fragments/decrypt.py index ea7cf59bc32..8b8da5015fa 100644 --- a/lib/ansible/plugins/doc_fragments/decrypt.py +++ b/lib/ansible/plugins/doc_fragments/decrypt.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017, Brian Coca # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/default_callback.py b/lib/ansible/plugins/doc_fragments/default_callback.py index 5798334643e..e206eb37a60 100644 --- a/lib/ansible/plugins/doc_fragments/default_callback.py +++ b/lib/ansible/plugins/doc_fragments/default_callback.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/files.py b/lib/ansible/plugins/doc_fragments/files.py index 374165261b5..ec762676ca0 100644 --- a/lib/ansible/plugins/doc_fragments/files.py +++ b/lib/ansible/plugins/doc_fragments/files.py @@ -2,8 +2,7 @@ # Copyright: (c) 2014, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/inventory_cache.py b/lib/ansible/plugins/doc_fragments/inventory_cache.py index 1a0d6316b39..03d6d7ccddd 100644 --- a/lib/ansible/plugins/doc_fragments/inventory_cache.py +++ b/lib/ansible/plugins/doc_fragments/inventory_cache.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/result_format_callback.py b/lib/ansible/plugins/doc_fragments/result_format_callback.py index f4f82b705df..3ca74aa5fc6 100644 --- a/lib/ansible/plugins/doc_fragments/result_format_callback.py +++ b/lib/ansible/plugins/doc_fragments/result_format_callback.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/return_common.py b/lib/ansible/plugins/doc_fragments/return_common.py index 6f542880502..900e4c05607 100644 --- a/lib/ansible/plugins/doc_fragments/return_common.py +++ b/lib/ansible/plugins/doc_fragments/return_common.py @@ -2,8 +2,7 @@ # Copyright: (c) 2016, Ansible, Inc # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/shell_common.py b/lib/ansible/plugins/doc_fragments/shell_common.py index 39d8730e8fb..a97fa994b94 100644 --- a/lib/ansible/plugins/doc_fragments/shell_common.py +++ b/lib/ansible/plugins/doc_fragments/shell_common.py @@ -1,7 +1,6 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/shell_windows.py b/lib/ansible/plugins/doc_fragments/shell_windows.py index 0bcc89c8bda..1f25ce02816 100644 --- a/lib/ansible/plugins/doc_fragments/shell_windows.py +++ b/lib/ansible/plugins/doc_fragments/shell_windows.py @@ -1,7 +1,6 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/template_common.py b/lib/ansible/plugins/doc_fragments/template_common.py index dbfe482ba59..9795e437192 100644 --- a/lib/ansible/plugins/doc_fragments/template_common.py +++ b/lib/ansible/plugins/doc_fragments/template_common.py @@ -3,8 +3,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/url.py b/lib/ansible/plugins/doc_fragments/url.py index bafeded84c6..8f90465d695 100644 --- a/lib/ansible/plugins/doc_fragments/url.py +++ b/lib/ansible/plugins/doc_fragments/url.py @@ -2,8 +2,7 @@ # Copyright: (c) 2018, John Barker # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/url_windows.py b/lib/ansible/plugins/doc_fragments/url_windows.py index 7b3e873ae6d..4b2c19d510a 100644 --- a/lib/ansible/plugins/doc_fragments/url_windows.py +++ b/lib/ansible/plugins/doc_fragments/url_windows.py @@ -3,8 +3,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment: diff --git a/lib/ansible/plugins/doc_fragments/validate.py b/lib/ansible/plugins/doc_fragments/validate.py index ac66d2530a6..b71011c9e8e 100644 --- a/lib/ansible/plugins/doc_fragments/validate.py +++ b/lib/ansible/plugins/doc_fragments/validate.py @@ -2,8 +2,7 @@ # Copyright: (c) 2015, Ansible, Inc # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/doc_fragments/vars_plugin_staging.py b/lib/ansible/plugins/doc_fragments/vars_plugin_staging.py index eacac1703a5..698b7bea994 100644 --- a/lib/ansible/plugins/doc_fragments/vars_plugin_staging.py +++ b/lib/ansible/plugins/doc_fragments/vars_plugin_staging.py @@ -3,8 +3,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/lib/ansible/plugins/filter/__init__.py b/lib/ansible/plugins/filter/__init__.py index 63b66021881..003711f8b58 100644 --- a/lib/ansible/plugins/filter/__init__.py +++ b/lib/ansible/plugins/filter/__init__.py @@ -1,8 +1,7 @@ # (c) Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible import constants as C from ansible.plugins import AnsibleJinja2Plugin diff --git a/lib/ansible/plugins/filter/core.py b/lib/ansible/plugins/filter/core.py index c0aa394b295..0e496ff7974 100644 --- a/lib/ansible/plugins/filter/core.py +++ b/lib/ansible/plugins/filter/core.py @@ -1,9 +1,7 @@ # (c) 2012, Jeroen Hoekx # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import base64 import glob diff --git a/lib/ansible/plugins/filter/encryption.py b/lib/ansible/plugins/filter/encryption.py index d501879a1c8..c6863fd3ead 100644 --- a/lib/ansible/plugins/filter/encryption.py +++ b/lib/ansible/plugins/filter/encryption.py @@ -1,8 +1,6 @@ # Copyright: (c) 2021, Ansible Project -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from jinja2.runtime import Undefined from jinja2.exceptions import UndefinedError diff --git a/lib/ansible/plugins/filter/urls.py b/lib/ansible/plugins/filter/urls.py index fb7abc6fe51..1f9cde2511f 100644 --- a/lib/ansible/plugins/filter/urls.py +++ b/lib/ansible/plugins/filter/urls.py @@ -3,8 +3,7 @@ # Copyright: (c) 2012, Dag Wieers (@dagwieers) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from functools import partial diff --git a/lib/ansible/plugins/filter/urlsplit.py b/lib/ansible/plugins/filter/urlsplit.py index 11c1f11cb11..8963659fcda 100644 --- a/lib/ansible/plugins/filter/urlsplit.py +++ b/lib/ansible/plugins/filter/urlsplit.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' name: urlsplit diff --git a/lib/ansible/plugins/httpapi/__init__.py b/lib/ansible/plugins/httpapi/__init__.py index 0773921fb6e..e6c4f181da7 100644 --- a/lib/ansible/plugins/httpapi/__init__.py +++ b/lib/ansible/plugins/httpapi/__init__.py @@ -1,8 +1,7 @@ # (c) 2018 Red Hat Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from abc import abstractmethod diff --git a/lib/ansible/plugins/inventory/__init__.py b/lib/ansible/plugins/inventory/__init__.py index a68f5966956..9210b10c4de 100644 --- a/lib/ansible/plugins/inventory/__init__.py +++ b/lib/ansible/plugins/inventory/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import hashlib import os diff --git a/lib/ansible/plugins/inventory/advanced_host_list.py b/lib/ansible/plugins/inventory/advanced_host_list.py index 3c5f52c7c04..9ca45b6b742 100644 --- a/lib/ansible/plugins/inventory/advanced_host_list.py +++ b/lib/ansible/plugins/inventory/advanced_host_list.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: advanced_host_list diff --git a/lib/ansible/plugins/inventory/auto.py b/lib/ansible/plugins/inventory/auto.py index 45941ca8fc4..c3b82845b15 100644 --- a/lib/ansible/plugins/inventory/auto.py +++ b/lib/ansible/plugins/inventory/auto.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: auto diff --git a/lib/ansible/plugins/inventory/constructed.py b/lib/ansible/plugins/inventory/constructed.py index 76b19e7a01c..6a7ec2c2190 100644 --- a/lib/ansible/plugins/inventory/constructed.py +++ b/lib/ansible/plugins/inventory/constructed.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: constructed diff --git a/lib/ansible/plugins/inventory/generator.py b/lib/ansible/plugins/inventory/generator.py index 1955f361df9..ba697dfca62 100644 --- a/lib/ansible/plugins/inventory/generator.py +++ b/lib/ansible/plugins/inventory/generator.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: generator diff --git a/lib/ansible/plugins/inventory/host_list.py b/lib/ansible/plugins/inventory/host_list.py index d0b2dadcfb4..c9ffcc8fd16 100644 --- a/lib/ansible/plugins/inventory/host_list.py +++ b/lib/ansible/plugins/inventory/host_list.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' name: host_list diff --git a/lib/ansible/plugins/inventory/ini.py b/lib/ansible/plugins/inventory/ini.py index 1ff4bf167d5..e2efde10ab9 100644 --- a/lib/ansible/plugins/inventory/ini.py +++ b/lib/ansible/plugins/inventory/ini.py @@ -1,7 +1,6 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: ini diff --git a/lib/ansible/plugins/inventory/script.py b/lib/ansible/plugins/inventory/script.py index 48d92343811..f2a82e6c643 100644 --- a/lib/ansible/plugins/inventory/script.py +++ b/lib/ansible/plugins/inventory/script.py @@ -2,8 +2,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: script diff --git a/lib/ansible/plugins/inventory/toml.py b/lib/ansible/plugins/inventory/toml.py index 1c2b4393f23..39a3d5c9aab 100644 --- a/lib/ansible/plugins/inventory/toml.py +++ b/lib/ansible/plugins/inventory/toml.py @@ -1,8 +1,7 @@ # Copyright (c) 2018 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' name: toml diff --git a/lib/ansible/plugins/inventory/yaml.py b/lib/ansible/plugins/inventory/yaml.py index 79af3dc6652..a3e9a879d5c 100644 --- a/lib/ansible/plugins/inventory/yaml.py +++ b/lib/ansible/plugins/inventory/yaml.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: yaml diff --git a/lib/ansible/plugins/list.py b/lib/ansible/plugins/list.py index cd4d51f5832..4408d6a4ae0 100644 --- a/lib/ansible/plugins/list.py +++ b/lib/ansible/plugins/list.py @@ -1,8 +1,7 @@ # (c) Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/plugins/loader.py b/lib/ansible/plugins/loader.py index 39b10950635..fb6ffe8ad7a 100644 --- a/lib/ansible/plugins/loader.py +++ b/lib/ansible/plugins/loader.py @@ -4,8 +4,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import glob import os diff --git a/lib/ansible/plugins/lookup/__init__.py b/lib/ansible/plugins/lookup/__init__.py index 21fab8c7f62..22e73032c85 100644 --- a/lib/ansible/plugins/lookup/__init__.py +++ b/lib/ansible/plugins/lookup/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from abc import abstractmethod diff --git a/lib/ansible/plugins/lookup/config.py b/lib/ansible/plugins/lookup/config.py index b476b53df4c..7bedbf4f6ab 100644 --- a/lib/ansible/plugins/lookup/config.py +++ b/lib/ansible/plugins/lookup/config.py @@ -1,7 +1,6 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: config diff --git a/lib/ansible/plugins/lookup/csvfile.py b/lib/ansible/plugins/lookup/csvfile.py index 76d97ed40a3..03558103478 100644 --- a/lib/ansible/plugins/lookup/csvfile.py +++ b/lib/ansible/plugins/lookup/csvfile.py @@ -1,8 +1,7 @@ # (c) 2013, Jan-Piet Mens # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: csvfile diff --git a/lib/ansible/plugins/lookup/dict.py b/lib/ansible/plugins/lookup/dict.py index af9a0819147..0a891ed7113 100644 --- a/lib/ansible/plugins/lookup/dict.py +++ b/lib/ansible/plugins/lookup/dict.py @@ -1,8 +1,7 @@ # (c) 2014, Kent R. Spillner # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: dict diff --git a/lib/ansible/plugins/lookup/env.py b/lib/ansible/plugins/lookup/env.py index db34d8d3c88..cb7e681123f 100644 --- a/lib/ansible/plugins/lookup/env.py +++ b/lib/ansible/plugins/lookup/env.py @@ -1,8 +1,7 @@ # (c) 2012, Jan-Piet Mens # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: env diff --git a/lib/ansible/plugins/lookup/file.py b/lib/ansible/plugins/lookup/file.py index 25946b25013..17338c0b8a2 100644 --- a/lib/ansible/plugins/lookup/file.py +++ b/lib/ansible/plugins/lookup/file.py @@ -1,8 +1,7 @@ # (c) 2012, Daniel Hokka Zakrisson # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: file diff --git a/lib/ansible/plugins/lookup/fileglob.py b/lib/ansible/plugins/lookup/fileglob.py index 00d5f09220d..5ab730d576f 100644 --- a/lib/ansible/plugins/lookup/fileglob.py +++ b/lib/ansible/plugins/lookup/fileglob.py @@ -1,8 +1,7 @@ # (c) 2012, Michael DeHaan # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: fileglob diff --git a/lib/ansible/plugins/lookup/first_found.py b/lib/ansible/plugins/lookup/first_found.py index d92e9354674..47f4db90fa9 100644 --- a/lib/ansible/plugins/lookup/first_found.py +++ b/lib/ansible/plugins/lookup/first_found.py @@ -1,8 +1,7 @@ # (c) 2013, seth vidal red hat, inc # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: first_found diff --git a/lib/ansible/plugins/lookup/indexed_items.py b/lib/ansible/plugins/lookup/indexed_items.py index f63a8957cd2..fe919cd4196 100644 --- a/lib/ansible/plugins/lookup/indexed_items.py +++ b/lib/ansible/plugins/lookup/indexed_items.py @@ -1,8 +1,7 @@ # (c) 2012, Michael DeHaan # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: indexed_items diff --git a/lib/ansible/plugins/lookup/ini.py b/lib/ansible/plugins/lookup/ini.py index 9467676e4d5..225e7d8e8fa 100644 --- a/lib/ansible/plugins/lookup/ini.py +++ b/lib/ansible/plugins/lookup/ini.py @@ -1,8 +1,7 @@ # (c) 2015, Yannig Perre # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: ini diff --git a/lib/ansible/plugins/lookup/inventory_hostnames.py b/lib/ansible/plugins/lookup/inventory_hostnames.py index 4fa1d686479..e9ba61bdce8 100644 --- a/lib/ansible/plugins/lookup/inventory_hostnames.py +++ b/lib/ansible/plugins/lookup/inventory_hostnames.py @@ -3,8 +3,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: inventory_hostnames diff --git a/lib/ansible/plugins/lookup/items.py b/lib/ansible/plugins/lookup/items.py index 162c1e7e0d2..058ba971796 100644 --- a/lib/ansible/plugins/lookup/items.py +++ b/lib/ansible/plugins/lookup/items.py @@ -1,8 +1,7 @@ # (c) 2012, Michael DeHaan # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: items diff --git a/lib/ansible/plugins/lookup/lines.py b/lib/ansible/plugins/lookup/lines.py index 6314e37ac06..7b08acf92f7 100644 --- a/lib/ansible/plugins/lookup/lines.py +++ b/lib/ansible/plugins/lookup/lines.py @@ -2,8 +2,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: lines diff --git a/lib/ansible/plugins/lookup/list.py b/lib/ansible/plugins/lookup/list.py index 6c553aeb5c7..a953f681fdc 100644 --- a/lib/ansible/plugins/lookup/list.py +++ b/lib/ansible/plugins/lookup/list.py @@ -1,10 +1,8 @@ # (c) 2012-17 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """ name: list diff --git a/lib/ansible/plugins/lookup/nested.py b/lib/ansible/plugins/lookup/nested.py index e768dbadd17..097c2a4f0ad 100644 --- a/lib/ansible/plugins/lookup/nested.py +++ b/lib/ansible/plugins/lookup/nested.py @@ -1,8 +1,7 @@ # (c) 2012, Michael DeHaan # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: nested diff --git a/lib/ansible/plugins/lookup/password.py b/lib/ansible/plugins/lookup/password.py index 1fe97f141ba..4db89d8c025 100644 --- a/lib/ansible/plugins/lookup/password.py +++ b/lib/ansible/plugins/lookup/password.py @@ -3,8 +3,7 @@ # (c) 2013, Maykel Moya # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: password diff --git a/lib/ansible/plugins/lookup/pipe.py b/lib/ansible/plugins/lookup/pipe.py index 20e922b67d0..0923f13bd4d 100644 --- a/lib/ansible/plugins/lookup/pipe.py +++ b/lib/ansible/plugins/lookup/pipe.py @@ -1,8 +1,7 @@ # (c) 2012, Daniel Hokka Zakrisson # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: pipe diff --git a/lib/ansible/plugins/lookup/random_choice.py b/lib/ansible/plugins/lookup/random_choice.py index 93e6c2e3a91..2e43d2e4afa 100644 --- a/lib/ansible/plugins/lookup/random_choice.py +++ b/lib/ansible/plugins/lookup/random_choice.py @@ -1,8 +1,7 @@ # (c) 2013, Michael DeHaan # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: random_choice diff --git a/lib/ansible/plugins/lookup/sequence.py b/lib/ansible/plugins/lookup/sequence.py index f4fda43b461..4954accfe42 100644 --- a/lib/ansible/plugins/lookup/sequence.py +++ b/lib/ansible/plugins/lookup/sequence.py @@ -1,8 +1,7 @@ # (c) 2013, Jayson Vantuyl # (c) 2012-17 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: sequence diff --git a/lib/ansible/plugins/lookup/subelements.py b/lib/ansible/plugins/lookup/subelements.py index f2216526746..e269be5235d 100644 --- a/lib/ansible/plugins/lookup/subelements.py +++ b/lib/ansible/plugins/lookup/subelements.py @@ -1,8 +1,7 @@ # (c) 2013, Serge van Ginderachter # (c) 2012-17 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: subelements diff --git a/lib/ansible/plugins/lookup/template.py b/lib/ansible/plugins/lookup/template.py index 358fa1da991..b2508d01b6c 100644 --- a/lib/ansible/plugins/lookup/template.py +++ b/lib/ansible/plugins/lookup/template.py @@ -2,8 +2,7 @@ # Copyright: (c) 2012-17, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: template diff --git a/lib/ansible/plugins/lookup/together.py b/lib/ansible/plugins/lookup/together.py index c990e06ba9e..0d0bfd961b1 100644 --- a/lib/ansible/plugins/lookup/together.py +++ b/lib/ansible/plugins/lookup/together.py @@ -1,8 +1,7 @@ # (c) 2013, Bradley Young # (c) 2012-17 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: together diff --git a/lib/ansible/plugins/lookup/unvault.py b/lib/ansible/plugins/lookup/unvault.py index d7f3cbaf8a3..f2db18eedfc 100644 --- a/lib/ansible/plugins/lookup/unvault.py +++ b/lib/ansible/plugins/lookup/unvault.py @@ -1,7 +1,6 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: unvault diff --git a/lib/ansible/plugins/lookup/url.py b/lib/ansible/plugins/lookup/url.py index f5c93f28ad9..c0ae01010d6 100644 --- a/lib/ansible/plugins/lookup/url.py +++ b/lib/ansible/plugins/lookup/url.py @@ -1,8 +1,7 @@ # (c) 2015, Brian Coca # (c) 2012-17 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: url diff --git a/lib/ansible/plugins/lookup/varnames.py b/lib/ansible/plugins/lookup/varnames.py index 4fd0153c14a..2163ce7acfd 100644 --- a/lib/ansible/plugins/lookup/varnames.py +++ b/lib/ansible/plugins/lookup/varnames.py @@ -1,7 +1,6 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: varnames diff --git a/lib/ansible/plugins/lookup/vars.py b/lib/ansible/plugins/lookup/vars.py index dd5f7639d81..14cac99c363 100644 --- a/lib/ansible/plugins/lookup/vars.py +++ b/lib/ansible/plugins/lookup/vars.py @@ -1,7 +1,6 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: vars diff --git a/lib/ansible/plugins/netconf/__init__.py b/lib/ansible/plugins/netconf/__init__.py index 1344d63791e..6887d7853e9 100644 --- a/lib/ansible/plugins/netconf/__init__.py +++ b/lib/ansible/plugins/netconf/__init__.py @@ -16,8 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from abc import abstractmethod from functools import wraps diff --git a/lib/ansible/plugins/shell/__init__.py b/lib/ansible/plugins/shell/__init__.py index c9f8addabdf..5a885763d48 100644 --- a/lib/ansible/plugins/shell/__init__.py +++ b/lib/ansible/plugins/shell/__init__.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import os.path diff --git a/lib/ansible/plugins/shell/cmd.py b/lib/ansible/plugins/shell/cmd.py index 152fdd052ab..db851df685f 100644 --- a/lib/ansible/plugins/shell/cmd.py +++ b/lib/ansible/plugins/shell/cmd.py @@ -1,7 +1,6 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: cmd diff --git a/lib/ansible/plugins/shell/powershell.py b/lib/ansible/plugins/shell/powershell.py index f2e78cbe2e8..405211aa7a9 100644 --- a/lib/ansible/plugins/shell/powershell.py +++ b/lib/ansible/plugins/shell/powershell.py @@ -1,8 +1,7 @@ # Copyright (c) 2014, Chris Church # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: powershell diff --git a/lib/ansible/plugins/shell/sh.py b/lib/ansible/plugins/shell/sh.py index 146c46671b7..e0412b762de 100644 --- a/lib/ansible/plugins/shell/sh.py +++ b/lib/ansible/plugins/shell/sh.py @@ -1,8 +1,7 @@ # Copyright (c) 2014, Chris Church # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: sh diff --git a/lib/ansible/plugins/strategy/__init__.py b/lib/ansible/plugins/strategy/__init__.py index d471effa2c3..0d056b92013 100644 --- a/lib/ansible/plugins/strategy/__init__.py +++ b/lib/ansible/plugins/strategy/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import cmd import functools diff --git a/lib/ansible/plugins/strategy/debug.py b/lib/ansible/plugins/strategy/debug.py index 0965bb37d46..6ee294b4dde 100644 --- a/lib/ansible/plugins/strategy/debug.py +++ b/lib/ansible/plugins/strategy/debug.py @@ -12,8 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: debug diff --git a/lib/ansible/plugins/strategy/free.py b/lib/ansible/plugins/strategy/free.py index 82a21b1c3c1..2c981101416 100644 --- a/lib/ansible/plugins/strategy/free.py +++ b/lib/ansible/plugins/strategy/free.py @@ -14,9 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: free diff --git a/lib/ansible/plugins/strategy/host_pinned.py b/lib/ansible/plugins/strategy/host_pinned.py index 70f22eb8497..f06550f9fff 100644 --- a/lib/ansible/plugins/strategy/host_pinned.py +++ b/lib/ansible/plugins/strategy/host_pinned.py @@ -14,9 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: host_pinned diff --git a/lib/ansible/plugins/strategy/linear.py b/lib/ansible/plugins/strategy/linear.py index 2fd4cbae3c2..f644d8037e2 100644 --- a/lib/ansible/plugins/strategy/linear.py +++ b/lib/ansible/plugins/strategy/linear.py @@ -14,9 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: linear diff --git a/lib/ansible/plugins/terminal/__init__.py b/lib/ansible/plugins/terminal/__init__.py index 2a280a91f89..a83e187bfeb 100644 --- a/lib/ansible/plugins/terminal/__init__.py +++ b/lib/ansible/plugins/terminal/__init__.py @@ -16,8 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/plugins/test/__init__.py b/lib/ansible/plugins/test/__init__.py index 140031679d0..b0b78d1fd5b 100644 --- a/lib/ansible/plugins/test/__init__.py +++ b/lib/ansible/plugins/test/__init__.py @@ -1,8 +1,7 @@ # (c) Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins import AnsibleJinja2Plugin diff --git a/lib/ansible/plugins/test/core.py b/lib/ansible/plugins/test/core.py index 498db0e00e6..f4570bb6448 100644 --- a/lib/ansible/plugins/test/core.py +++ b/lib/ansible/plugins/test/core.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re import operator as py_operator diff --git a/lib/ansible/plugins/test/files.py b/lib/ansible/plugins/test/files.py index f075cae8040..fc142b72a66 100644 --- a/lib/ansible/plugins/test/files.py +++ b/lib/ansible/plugins/test/files.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from os.path import isdir, isfile, isabs, exists, lexists, islink, samefile, ismount diff --git a/lib/ansible/plugins/test/mathstuff.py b/lib/ansible/plugins/test/mathstuff.py index 9a3f467bf26..4bf33e88285 100644 --- a/lib/ansible/plugins/test/mathstuff.py +++ b/lib/ansible/plugins/test/mathstuff.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import math diff --git a/lib/ansible/plugins/test/uri.py b/lib/ansible/plugins/test/uri.py index 7ef33812cf9..b9679d0c134 100644 --- a/lib/ansible/plugins/test/uri.py +++ b/lib/ansible/plugins/test/uri.py @@ -1,8 +1,6 @@ # (c) Ansible Project -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from urllib.parse import urlparse diff --git a/lib/ansible/plugins/vars/__init__.py b/lib/ansible/plugins/vars/__init__.py index 4f9045b067f..12b52d92283 100644 --- a/lib/ansible/plugins/vars/__init__.py +++ b/lib/ansible/plugins/vars/__init__.py @@ -15,8 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins import AnsiblePlugin from ansible.utils.path import basedir diff --git a/lib/ansible/plugins/vars/host_group_vars.py b/lib/ansible/plugins/vars/host_group_vars.py index 28b42131ed1..0a97948cf8c 100644 --- a/lib/ansible/plugins/vars/host_group_vars.py +++ b/lib/ansible/plugins/vars/host_group_vars.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . ############################################# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: host_group_vars diff --git a/lib/ansible/release.py b/lib/ansible/release.py index ec1f0bcfbef..4e17987ba70 100644 --- a/lib/ansible/release.py +++ b/lib/ansible/release.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations __version__ = '2.17.0.dev0' __author__ = 'Ansible, Inc.' diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py index e6118939539..f79ff35bcff 100644 --- a/lib/ansible/template/__init__.py +++ b/lib/ansible/template/__init__.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ast import datetime diff --git a/lib/ansible/template/native_helpers.py b/lib/ansible/template/native_helpers.py index 9f319fe4c4f..7c4ce922151 100644 --- a/lib/ansible/template/native_helpers.py +++ b/lib/ansible/template/native_helpers.py @@ -1,9 +1,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ast diff --git a/lib/ansible/template/template.py b/lib/ansible/template/template.py index 5eb66da6bea..4919f364f14 100644 --- a/lib/ansible/template/template.py +++ b/lib/ansible/template/template.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from jinja2.nativetypes import NativeTemplate diff --git a/lib/ansible/template/vars.py b/lib/ansible/template/vars.py index 6f408279960..56e5f5be997 100644 --- a/lib/ansible/template/vars.py +++ b/lib/ansible/template/vars.py @@ -1,5 +1,6 @@ # (c) 2012, Michael DeHaan # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations from collections import ChainMap diff --git a/lib/ansible/utils/__init__.py b/lib/ansible/utils/__init__.py index ae8ccff5952..64fee52484f 100644 --- a/lib/ansible/utils/__init__.py +++ b/lib/ansible/utils/__init__.py @@ -15,6 +15,4 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations diff --git a/lib/ansible/utils/cmd_functions.py b/lib/ansible/utils/cmd_functions.py index 436d955b318..99de684c636 100644 --- a/lib/ansible/utils/cmd_functions.py +++ b/lib/ansible/utils/cmd_functions.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import select diff --git a/lib/ansible/utils/collection_loader/__init__.py b/lib/ansible/utils/collection_loader/__init__.py index 83cc2462eb4..2ae2fe54279 100644 --- a/lib/ansible/utils/collection_loader/__init__.py +++ b/lib/ansible/utils/collection_loader/__init__.py @@ -4,8 +4,7 @@ # CAUTION: This implementation of the collection loader is used by ansible-test. # Because of this, it must be compatible with all Python versions supported on the controller or remote. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # FIXME: decide what of this we want to actually be public/toplevel, put other stuff on a utility class? from ._collection_config import AnsibleCollectionConfig diff --git a/lib/ansible/utils/collection_loader/_collection_config.py b/lib/ansible/utils/collection_loader/_collection_config.py index 4f73a1a7319..add20c60eff 100644 --- a/lib/ansible/utils/collection_loader/_collection_config.py +++ b/lib/ansible/utils/collection_loader/_collection_config.py @@ -4,8 +4,7 @@ # CAUTION: This implementation of the collection loader is used by ansible-test. # Because of this, it must be compatible with all Python versions supported on the controller or remote. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.six import add_metaclass diff --git a/lib/ansible/utils/collection_loader/_collection_finder.py b/lib/ansible/utils/collection_loader/_collection_finder.py index 16d0bcc6e8e..85660b41d74 100644 --- a/lib/ansible/utils/collection_loader/_collection_finder.py +++ b/lib/ansible/utils/collection_loader/_collection_finder.py @@ -4,8 +4,7 @@ # CAUTION: This implementation of the collection loader is used by ansible-test. # Because of this, it must be compatible with all Python versions supported on the controller or remote. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import itertools import os diff --git a/lib/ansible/utils/collection_loader/_collection_meta.py b/lib/ansible/utils/collection_loader/_collection_meta.py index deaac8e9594..3b0333f7282 100644 --- a/lib/ansible/utils/collection_loader/_collection_meta.py +++ b/lib/ansible/utils/collection_loader/_collection_meta.py @@ -4,8 +4,7 @@ # CAUTION: This implementation of the collection loader is used by ansible-test. # Because of this, it must be compatible with all Python versions supported on the controller or remote. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations try: from collections.abc import Mapping diff --git a/lib/ansible/utils/color.py b/lib/ansible/utils/color.py index be8fb004e48..0e0063544d5 100644 --- a/lib/ansible/utils/color.py +++ b/lib/ansible/utils/color.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re import sys diff --git a/lib/ansible/utils/context_objects.py b/lib/ansible/utils/context_objects.py index efe15fea821..02db666b0a4 100644 --- a/lib/ansible/utils/context_objects.py +++ b/lib/ansible/utils/context_objects.py @@ -1,13 +1,10 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - """ Hold command line arguments for use in other modules """ +from __future__ import annotations from abc import ABCMeta from collections.abc import Container, Mapping, Sequence, Set diff --git a/lib/ansible/utils/encrypt.py b/lib/ansible/utils/encrypt.py index 541c5c82834..5e1b488b15e 100644 --- a/lib/ansible/utils/encrypt.py +++ b/lib/ansible/utils/encrypt.py @@ -1,8 +1,7 @@ # (c) 2012-2014, Michael DeHaan # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import random import re diff --git a/lib/ansible/utils/fqcn.py b/lib/ansible/utils/fqcn.py index a492be1f180..043d8a056e5 100644 --- a/lib/ansible/utils/fqcn.py +++ b/lib/ansible/utils/fqcn.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def add_internal_fqcns(names): diff --git a/lib/ansible/utils/galaxy.py b/lib/ansible/utils/galaxy.py index bbb26fb1115..977ae2cbd0a 100644 --- a/lib/ansible/utils/galaxy.py +++ b/lib/ansible/utils/galaxy.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import tempfile diff --git a/lib/ansible/utils/hashing.py b/lib/ansible/utils/hashing.py index 97ea1dc13cd..e8faf25f76f 100644 --- a/lib/ansible/utils/hashing.py +++ b/lib/ansible/utils/hashing.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/lib/ansible/utils/helpers.py b/lib/ansible/utils/helpers.py index 658ad99c968..c9b5f16f294 100644 --- a/lib/ansible/utils/helpers.py +++ b/lib/ansible/utils/helpers.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.six import string_types diff --git a/lib/ansible/utils/jsonrpc.py b/lib/ansible/utils/jsonrpc.py index 2af8bd3581e..37b286a0a52 100644 --- a/lib/ansible/utils/jsonrpc.py +++ b/lib/ansible/utils/jsonrpc.py @@ -1,8 +1,7 @@ # (c) 2017, Peter Sprygada # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import pickle diff --git a/lib/ansible/utils/listify.py b/lib/ansible/utils/listify.py index 0e6a8724911..362a50ba1f1 100644 --- a/lib/ansible/utils/listify.py +++ b/lib/ansible/utils/listify.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import Iterable diff --git a/lib/ansible/utils/lock.py b/lib/ansible/utils/lock.py index 34387dc5bd7..9f834da7333 100644 --- a/lib/ansible/utils/lock.py +++ b/lib/ansible/utils/lock.py @@ -1,9 +1,7 @@ # Copyright (c) 2020 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from functools import wraps diff --git a/lib/ansible/utils/multiprocessing.py b/lib/ansible/utils/multiprocessing.py index 2912f71230c..c573c7275ea 100644 --- a/lib/ansible/utils/multiprocessing.py +++ b/lib/ansible/utils/multiprocessing.py @@ -1,9 +1,7 @@ # Copyright (c) 2019 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import multiprocessing diff --git a/lib/ansible/utils/native_jinja.py b/lib/ansible/utils/native_jinja.py index 53ef14004ad..15d1624cb98 100644 --- a/lib/ansible/utils/native_jinja.py +++ b/lib/ansible/utils/native_jinja.py @@ -1,9 +1,7 @@ # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.six import text_type diff --git a/lib/ansible/utils/path.py b/lib/ansible/utils/path.py index e4e00ce76f7..ac0b450839f 100644 --- a/lib/ansible/utils/path.py +++ b/lib/ansible/utils/path.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import shutil diff --git a/lib/ansible/utils/plugin_docs.py b/lib/ansible/utils/plugin_docs.py index 91b37228a8f..48eabc7e2c1 100644 --- a/lib/ansible/utils/plugin_docs.py +++ b/lib/ansible/utils/plugin_docs.py @@ -1,8 +1,7 @@ # Copyright: (c) 2012, Jan-Piet Mens # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import MutableMapping, MutableSet, MutableSequence from pathlib import Path diff --git a/lib/ansible/utils/py3compat.py b/lib/ansible/utils/py3compat.py index 52011322ad5..d66557eb891 100644 --- a/lib/ansible/utils/py3compat.py +++ b/lib/ansible/utils/py3compat.py @@ -7,9 +7,7 @@ # successful, the code in six will be available under six's more liberal license: # https://mail.python.org/pipermail/python-porting/2018-July/000539.html -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import sys diff --git a/lib/ansible/utils/sentinel.py b/lib/ansible/utils/sentinel.py index ca4f82764e7..0fdbf4ce318 100644 --- a/lib/ansible/utils/sentinel.py +++ b/lib/ansible/utils/sentinel.py @@ -1,9 +1,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class Sentinel: diff --git a/lib/ansible/utils/shlex.py b/lib/ansible/utils/shlex.py index 8f50ffd9824..470270d2803 100644 --- a/lib/ansible/utils/shlex.py +++ b/lib/ansible/utils/shlex.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # alongwith Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import shlex diff --git a/lib/ansible/utils/singleton.py b/lib/ansible/utils/singleton.py index 4299403eae2..0b684238614 100644 --- a/lib/ansible/utils/singleton.py +++ b/lib/ansible/utils/singleton.py @@ -1,9 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from threading import RLock diff --git a/lib/ansible/utils/ssh_functions.py b/lib/ansible/utils/ssh_functions.py index 594dbc0e7a1..a96249e4180 100644 --- a/lib/ansible/utils/ssh_functions.py +++ b/lib/ansible/utils/ssh_functions.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import subprocess diff --git a/lib/ansible/utils/unicode.py b/lib/ansible/utils/unicode.py index b5304ba8a12..2ea456cc6f0 100644 --- a/lib/ansible/utils/unicode.py +++ b/lib/ansible/utils/unicode.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.text.converters import to_text diff --git a/lib/ansible/utils/unsafe_proxy.py b/lib/ansible/utils/unsafe_proxy.py index b0443a6dfe2..f26a5f685aa 100644 --- a/lib/ansible/utils/unsafe_proxy.py +++ b/lib/ansible/utils/unsafe_proxy.py @@ -50,8 +50,7 @@ # http://code.activestate.com/recipes/496741-object-proxying/ # Author: Tomer Filiba -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import Mapping, Set diff --git a/lib/ansible/utils/vars.py b/lib/ansible/utils/vars.py index 07d635558f8..373fc706a03 100644 --- a/lib/ansible/utils/vars.py +++ b/lib/ansible/utils/vars.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import keyword import random diff --git a/lib/ansible/utils/version.py b/lib/ansible/utils/version.py index e7da9fdbf69..77c8228a8af 100644 --- a/lib/ansible/utils/version.py +++ b/lib/ansible/utils/version.py @@ -1,9 +1,7 @@ # Copyright (c) 2020 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/lib/ansible/vars/clean.py b/lib/ansible/vars/clean.py index c49e63ec109..559242e0f84 100644 --- a/lib/ansible/vars/clean.py +++ b/lib/ansible/vars/clean.py @@ -1,9 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import re diff --git a/lib/ansible/vars/fact_cache.py b/lib/ansible/vars/fact_cache.py index 868a90549ac..ce0dc3a3311 100644 --- a/lib/ansible/vars/fact_cache.py +++ b/lib/ansible/vars/fact_cache.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import MutableMapping diff --git a/lib/ansible/vars/hostvars.py b/lib/ansible/vars/hostvars.py index 62229543fa4..21328dfeed0 100644 --- a/lib/ansible/vars/hostvars.py +++ b/lib/ansible/vars/hostvars.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import Mapping diff --git a/lib/ansible/vars/manager.py b/lib/ansible/vars/manager.py index ec69f55a028..262c897c33c 100644 --- a/lib/ansible/vars/manager.py +++ b/lib/ansible/vars/manager.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import sys diff --git a/lib/ansible/vars/reserved.py b/lib/ansible/vars/reserved.py index 2d1b4d51da3..aece04d652d 100644 --- a/lib/ansible/vars/reserved.py +++ b/lib/ansible/vars/reserved.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.playbook import Play from ansible.playbook.block import Block diff --git a/setup.py b/setup.py index b17ae8db832..26e680e36fc 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pathlib diff --git a/test/integration/targets/ansiballz_python/library/check_rlimit_and_maxfd.py b/test/integration/targets/ansiballz_python/library/check_rlimit_and_maxfd.py index a01ee997635..cc3949bc872 100644 --- a/test/integration/targets/ansiballz_python/library/check_rlimit_and_maxfd.py +++ b/test/integration/targets/ansiballz_python/library/check_rlimit_and_maxfd.py @@ -3,8 +3,7 @@ # Copyright 2018 Red Hat | Ansible # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import resource import subprocess diff --git a/test/integration/targets/ansiballz_python/library/custom_module.py b/test/integration/targets/ansiballz_python/library/custom_module.py index 625823eabe4..2436bb20b6e 100644 --- a/test/integration/targets/ansiballz_python/library/custom_module.py +++ b/test/integration/targets/ansiballz_python/library/custom_module.py @@ -1,7 +1,6 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ..module_utils.basic import AnsibleModule # pylint: disable=relative-beyond-top-level from ..module_utils.custom_util import forty_two # pylint: disable=relative-beyond-top-level diff --git a/test/integration/targets/ansiballz_python/library/sys_check.py b/test/integration/targets/ansiballz_python/library/sys_check.py index aa22fe68200..8454c07d15b 100644 --- a/test/integration/targets/ansiballz_python/library/sys_check.py +++ b/test/integration/targets/ansiballz_python/library/sys_check.py @@ -2,8 +2,7 @@ # https://github.com/ansible/ansible/issues/64664 # https://github.com/ansible/ansible/issues/64479 -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/integration/targets/ansiballz_python/module_utils/custom_util.py b/test/integration/targets/ansiballz_python/module_utils/custom_util.py index 0393db473f4..c9e7ffde4d2 100644 --- a/test/integration/targets/ansiballz_python/module_utils/custom_util.py +++ b/test/integration/targets/ansiballz_python/module_utils/custom_util.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations def forty_two(): diff --git a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/cache/notjsonfile.py b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/cache/notjsonfile.py index 9fa25b400a4..a6203b91cb9 100644 --- a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/cache/notjsonfile.py +++ b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/cache/notjsonfile.py @@ -1,9 +1,7 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' cache: notjsonfile diff --git a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/inventory/statichost.py b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/inventory/statichost.py index dfc12710c1d..eb5f5f35bc5 100644 --- a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/inventory/statichost.py +++ b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/inventory/statichost.py @@ -1,8 +1,7 @@ # Copyright (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' inventory: statichost diff --git a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/lookup/noop.py b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/lookup/noop.py index 639d3c6b055..43ac4b2d63f 100644 --- a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/lookup/noop.py +++ b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/lookup/noop.py @@ -1,10 +1,8 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """ lookup: noop diff --git a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/fakemodule.py b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/fakemodule.py index a1caeb148bd..6488cba0702 100644 --- a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/fakemodule.py +++ b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/fakemodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ diff --git a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/notrealmodule.py b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/notrealmodule.py index 4479f23fa5d..b7dcf510462 100644 --- a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/notrealmodule.py +++ b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/notrealmodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/randommodule.py b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/randommodule.py index fb0e319d142..b017112b3b1 100644 --- a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/randommodule.py +++ b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/modules/randommodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/vars/noop_vars_plugin.py b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/vars/noop_vars_plugin.py index ae0f75e0b3d..61de5f434b2 100644 --- a/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/vars/noop_vars_plugin.py +++ b/test/integration/targets/ansible-doc/broken-docs/collections/ansible_collections/testns/testcol/plugins/vars/noop_vars_plugin.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' vars: noop_vars_plugin diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/cache/notjsonfile.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/cache/notjsonfile.py index ea4a72299d5..32abc43aa76 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/cache/notjsonfile.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/cache/notjsonfile.py @@ -1,9 +1,7 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' cache: notjsonfile diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/filter_subdir/in_subdir.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/filter_subdir/in_subdir.py index a8924e1f4ee..d912c028ec2 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/filter_subdir/in_subdir.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/filter_subdir/in_subdir.py @@ -1,8 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.utils.display import Display diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/grouped.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/grouped.py index a10c7aaf044..47ac9c4466c 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/grouped.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/grouped.py @@ -1,8 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.utils.display import Display diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/inventory/statichost.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/inventory/statichost.py index 1870b8ea104..60c60f92af6 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/inventory/statichost.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/inventory/statichost.py @@ -1,8 +1,7 @@ # Copyright (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' inventory: statichost diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/lookup/noop.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/lookup/noop.py index 7a64a5d5752..7f693951425 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/lookup/noop.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/lookup/noop.py @@ -1,10 +1,8 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """ lookup: noop diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/database/database_type/subdir_module.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/database/database_type/subdir_module.py index dd41305bab9..a7bcf5055a8 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/database/database_type/subdir_module.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/database/database_type/subdir_module.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/fakemodule.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/fakemodule.py index 6d18c08767d..39c4c612361 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/fakemodule.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/fakemodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/notrealmodule.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/notrealmodule.py index 4479f23fa5d..b7dcf510462 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/notrealmodule.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/notrealmodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/randommodule.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/randommodule.py index aaaecb80f76..51efdfd28bd 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/randommodule.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/modules/randommodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/test/test_test.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/test/test_test.py index f1c2b3ab45e..160256c7b27 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/test/test_test.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/test/test_test.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def yolo(value): diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/vars/noop_vars_plugin.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/vars/noop_vars_plugin.py index 94e7feb0e32..93c076b5d38 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/vars/noop_vars_plugin.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/vars/noop_vars_plugin.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' vars: noop_vars_plugin diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/deprecation.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/deprecation.py index 3942d722220..fdb85abf4ca 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/deprecation.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/deprecation.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/module.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/module.py index a5723632e8f..5fbc352943e 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/module.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/module.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/plugin.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/plugin.py index 2fe4e4a6b26..eddd61e2109 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/plugin.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/plugin.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/version_added.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/version_added.py index 73e5f2f8cb5..d901404839c 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/version_added.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol2/plugins/doc_fragments/version_added.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol3/plugins/modules/test1.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol3/plugins/modules/test1.py index 02dfb89d569..1d2f370fc94 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol3/plugins/modules/test1.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol3/plugins/modules/test1.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol4/plugins/modules/test2.py b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol4/plugins/modules/test2.py index ddb0c114fa2..d41920bc7a2 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol4/plugins/modules/test2.py +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol4/plugins/modules/test2.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ diff --git a/test/integration/targets/ansible-doc/filter_plugins/other.py b/test/integration/targets/ansible-doc/filter_plugins/other.py index 1bc2e17c4b4..3392dd5b470 100644 --- a/test/integration/targets/ansible-doc/filter_plugins/other.py +++ b/test/integration/targets/ansible-doc/filter_plugins/other.py @@ -1,8 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.utils.display import Display diff --git a/test/integration/targets/ansible-doc/fix-urls.py b/test/integration/targets/ansible-doc/fix-urls.py index 1379a4e4a0b..a8e05765dcf 100644 --- a/test/integration/targets/ansible-doc/fix-urls.py +++ b/test/integration/targets/ansible-doc/fix-urls.py @@ -1,4 +1,5 @@ """Unwrap URLs to docs.ansible.com and remove version""" +from __future__ import annotations import re import sys diff --git a/test/integration/targets/ansible-doc/library/double_doc.py b/test/integration/targets/ansible-doc/library/double_doc.py index 6f0412a6bfa..80bd3dda3f3 100644 --- a/test/integration/targets/ansible-doc/library/double_doc.py +++ b/test/integration/targets/ansible-doc/library/double_doc.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/test/integration/targets/ansible-doc/library/test_docs.py b/test/integration/targets/ansible-doc/library/test_docs.py index 39ae3728e62..ba7817d8a20 100644 --- a/test/integration/targets/ansible-doc/library/test_docs.py +++ b/test/integration/targets/ansible-doc/library/test_docs.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/integration/targets/ansible-doc/library/test_docs_missing_description.py b/test/integration/targets/ansible-doc/library/test_docs_missing_description.py index 6ed41836b0b..40f39ef5834 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_missing_description.py +++ b/test/integration/targets/ansible-doc/library/test_docs_missing_description.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-doc/library/test_docs_no_metadata.py b/test/integration/targets/ansible-doc/library/test_docs_no_metadata.py index 4ea86f023e0..b4344e99faa 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_no_metadata.py +++ b/test/integration/targets/ansible-doc/library/test_docs_no_metadata.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-doc/library/test_docs_no_status.py b/test/integration/targets/ansible-doc/library/test_docs_no_status.py index 1b0db4e9632..f870e666d44 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_no_status.py +++ b/test/integration/targets/ansible-doc/library/test_docs_no_status.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/integration/targets/ansible-doc/library/test_docs_non_iterable_status.py b/test/integration/targets/ansible-doc/library/test_docs_non_iterable_status.py index 63d080f6532..6e78ea7c540 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_non_iterable_status.py +++ b/test/integration/targets/ansible-doc/library/test_docs_non_iterable_status.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/integration/targets/ansible-doc/library/test_docs_removed_precedence.py b/test/integration/targets/ansible-doc/library/test_docs_removed_precedence.py index 3de1c6906c4..fdba64e5ad5 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_removed_precedence.py +++ b/test/integration/targets/ansible-doc/library/test_docs_removed_precedence.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-doc/library/test_docs_removed_status.py b/test/integration/targets/ansible-doc/library/test_docs_removed_status.py index cb48c1694c5..18f32a2b500 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_removed_status.py +++ b/test/integration/targets/ansible-doc/library/test_docs_removed_status.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/integration/targets/ansible-doc/library/test_docs_returns.py b/test/integration/targets/ansible-doc/library/test_docs_returns.py index 77c1376453f..d21abf3efc0 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_returns.py +++ b/test/integration/targets/ansible-doc/library/test_docs_returns.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-doc/library/test_docs_returns_broken.py b/test/integration/targets/ansible-doc/library/test_docs_returns_broken.py index d6d62643f0a..0c3119bc255 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_returns_broken.py +++ b/test/integration/targets/ansible-doc/library/test_docs_returns_broken.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-doc/library/test_docs_suboptions.py b/test/integration/targets/ansible-doc/library/test_docs_suboptions.py index c922d1d6cc3..7f93e22d46a 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_suboptions.py +++ b/test/integration/targets/ansible-doc/library/test_docs_suboptions.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-doc/library/test_docs_yaml_anchors.py b/test/integration/targets/ansible-doc/library/test_docs_yaml_anchors.py index bec029225e2..419f3504338 100644 --- a/test/integration/targets/ansible-doc/library/test_docs_yaml_anchors.py +++ b/test/integration/targets/ansible-doc/library/test_docs_yaml_anchors.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-doc/library/test_no_docs.py b/test/integration/targets/ansible-doc/library/test_no_docs.py index 5503aedb8cd..2db81ae6354 100644 --- a/test/integration/targets/ansible-doc/library/test_no_docs.py +++ b/test/integration/targets/ansible-doc/library/test_no_docs.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/integration/targets/ansible-doc/library/test_no_docs_no_metadata.py b/test/integration/targets/ansible-doc/library/test_no_docs_no_metadata.py index 48872684739..fb70e5396ac 100644 --- a/test/integration/targets/ansible-doc/library/test_no_docs_no_metadata.py +++ b/test/integration/targets/ansible-doc/library/test_no_docs_no_metadata.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/ansible-doc/library/test_no_docs_no_status.py b/test/integration/targets/ansible-doc/library/test_no_docs_no_status.py index f90c5c71222..dba36d16f55 100644 --- a/test/integration/targets/ansible-doc/library/test_no_docs_no_status.py +++ b/test/integration/targets/ansible-doc/library/test_no_docs_no_status.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/integration/targets/ansible-doc/library/test_no_docs_non_iterable_status.py b/test/integration/targets/ansible-doc/library/test_no_docs_non_iterable_status.py index 44fbedee71c..0d22a1ef95f 100644 --- a/test/integration/targets/ansible-doc/library/test_no_docs_non_iterable_status.py +++ b/test/integration/targets/ansible-doc/library/test_no_docs_non_iterable_status.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/integration/targets/ansible-doc/lookup_plugins/_deprecated_with_adj_docs.py b/test/integration/targets/ansible-doc/lookup_plugins/_deprecated_with_adj_docs.py index 81d401d4248..810521f1bbc 100644 --- a/test/integration/targets/ansible-doc/lookup_plugins/_deprecated_with_adj_docs.py +++ b/test/integration/targets/ansible-doc/lookup_plugins/_deprecated_with_adj_docs.py @@ -1,5 +1,4 @@ # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations diff --git a/test/integration/targets/ansible-doc/lookup_plugins/_deprecated_with_docs.py b/test/integration/targets/ansible-doc/lookup_plugins/_deprecated_with_docs.py index 4fd63aa3efe..449f3922545 100644 --- a/test/integration/targets/ansible-doc/lookup_plugins/_deprecated_with_docs.py +++ b/test/integration/targets/ansible-doc/lookup_plugins/_deprecated_with_docs.py @@ -1,8 +1,7 @@ # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-galaxy-collection-cli/files/make_collection_dir.py b/test/integration/targets/ansible-galaxy-collection-cli/files/make_collection_dir.py index 60c43cc70f5..e5c33596e48 100644 --- a/test/integration/targets/ansible-galaxy-collection-cli/files/make_collection_dir.py +++ b/test/integration/targets/ansible-galaxy-collection-cli/files/make_collection_dir.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import sys import pathlib diff --git a/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py b/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py index 6182e865db0..7bba841a982 100644 --- a/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py +++ b/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py @@ -3,8 +3,7 @@ # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import hashlib import io diff --git a/test/integration/targets/ansible-galaxy-collection/files/test_module.py b/test/integration/targets/ansible-galaxy-collection/files/test_module.py index d7e48149247..d4bb3c3c66e 100644 --- a/test/integration/targets/ansible-galaxy-collection/files/test_module.py +++ b/test/integration/targets/ansible-galaxy-collection/files/test_module.py @@ -4,8 +4,7 @@ # (c) 2016, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/ansible-galaxy-collection/library/reset_pulp.py b/test/integration/targets/ansible-galaxy-collection/library/reset_pulp.py index c1f5e1d73ce..90397a55a9a 100644 --- a/test/integration/targets/ansible-galaxy-collection/library/reset_pulp.py +++ b/test/integration/targets/ansible-galaxy-collection/library/reset_pulp.py @@ -3,8 +3,7 @@ # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' --- diff --git a/test/integration/targets/ansible-galaxy-collection/library/setup_collections.py b/test/integration/targets/ansible-galaxy-collection/library/setup_collections.py index 423edd9ee89..b7d262aced1 100644 --- a/test/integration/targets/ansible-galaxy-collection/library/setup_collections.py +++ b/test/integration/targets/ansible-galaxy-collection/library/setup_collections.py @@ -3,8 +3,7 @@ # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = { 'metadata_version': '1.1', diff --git a/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py b/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py index cfd908c17b2..859ddebcd12 100755 --- a/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py +++ b/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Create a role archive which overwrites an arbitrary file.""" +from __future__ import annotations import argparse import pathlib diff --git a/test/integration/targets/ansible-galaxy/files/testserver.py b/test/integration/targets/ansible-galaxy/files/testserver.py index 8cca6a83998..077ae138c37 100644 --- a/test/integration/targets/ansible-galaxy/files/testserver.py +++ b/test/integration/targets/ansible-galaxy/files/testserver.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import http.server import socketserver diff --git a/test/integration/targets/ansible-inventory/filter_plugins/toml.py b/test/integration/targets/ansible-inventory/filter_plugins/toml.py index 997173c49f0..6d05cf44960 100644 --- a/test/integration/targets/ansible-inventory/filter_plugins/toml.py +++ b/test/integration/targets/ansible-inventory/filter_plugins/toml.py @@ -1,9 +1,7 @@ # (c) 2017, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import functools diff --git a/test/integration/targets/ansible-runner/files/adhoc_example1.py b/test/integration/targets/ansible-runner/files/adhoc_example1.py index fe7f9446ef2..4341a69e9d0 100644 --- a/test/integration/targets/ansible-runner/files/adhoc_example1.py +++ b/test/integration/targets/ansible-runner/files/adhoc_example1.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/ansible-runner/files/playbook_example1.py b/test/integration/targets/ansible-runner/files/playbook_example1.py index 550c1857cb9..1af7ee00ec8 100644 --- a/test/integration/targets/ansible-runner/files/playbook_example1.py +++ b/test/integration/targets/ansible-runner/files/playbook_example1.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/test/integration/targets/ansible-runner/filter_plugins/parse.py b/test/integration/targets/ansible-runner/filter_plugins/parse.py index 7842f6c64be..9a20e859483 100644 --- a/test/integration/targets/ansible-runner/filter_plugins/parse.py +++ b/test/integration/targets/ansible-runner/filter_plugins/parse.py @@ -1,6 +1,5 @@ -from __future__ import (absolute_import, division, print_function) +from __future__ import annotations -__metaclass__ = type import re import json diff --git a/test/integration/targets/ansible-test-config-invalid/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_test.py b/test/integration/targets/ansible-test-config-invalid/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_test.py index 06e7782e57d..c960bfe423e 100644 --- a/test/integration/targets/ansible-test-config-invalid/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_test.py +++ b/test/integration/targets/ansible-test-config-invalid/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_test.py @@ -1,2 +1,5 @@ +from __future__ import annotations + + def test_me(): pass diff --git a/test/integration/targets/ansible-test-config/ansible_collections/ns/col/plugins/module_utils/test.py b/test/integration/targets/ansible-test-config/ansible_collections/ns/col/plugins/module_utils/test.py index 962dba2b493..47450f024e3 100644 --- a/test/integration/targets/ansible-test-config/ansible_collections/ns/col/plugins/module_utils/test.py +++ b/test/integration/targets/ansible-test-config/ansible_collections/ns/col/plugins/module_utils/test.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import sys import os diff --git a/test/integration/targets/ansible-test-config/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_test.py b/test/integration/targets/ansible-test-config/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_test.py index b320a15aa70..07b85126ab0 100644 --- a/test/integration/targets/ansible-test-config/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_test.py +++ b/test/integration/targets/ansible-test-config/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_test.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from ansible_collections.ns.col.plugins.module_utils import test diff --git a/test/integration/targets/ansible-test-coverage/ansible_collections/ns/col/plugins/module_utils/test_util.py b/test/integration/targets/ansible-test-coverage/ansible_collections/ns/col/plugins/module_utils/test_util.py index 481c4b8568e..e8d6b91da59 100644 --- a/test/integration/targets/ansible-test-coverage/ansible_collections/ns/col/plugins/module_utils/test_util.py +++ b/test/integration/targets/ansible-test-coverage/ansible_collections/ns/col/plugins/module_utils/test_util.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations def test_coverage(): diff --git a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/doc_fragments/ps_util.py b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/doc_fragments/ps_util.py index e69844b349d..c8e8b70903d 100644 --- a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/doc_fragments/ps_util.py +++ b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/doc_fragments/ps_util.py @@ -3,8 +3,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment: diff --git a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/module_utils/my_util.py b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/module_utils/my_util.py index b9c531cf8aa..ff10e2d5218 100644 --- a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/module_utils/my_util.py +++ b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/module_utils/my_util.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations def hello(name): diff --git a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/modules/hello.py b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/modules/hello.py index c8a0cf75a03..a6859330966 100644 --- a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/modules/hello.py +++ b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/plugins/modules/hello.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: hello diff --git a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_my_util.py b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_my_util.py index 7df87103767..84a49ac381d 100644 --- a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_my_util.py +++ b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_my_util.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from .....plugins.module_utils.my_util import hello diff --git a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/tests/unit/plugins/modules/test_hello.py b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/tests/unit/plugins/modules/test_hello.py index 95ee0574fac..46c9de1976e 100644 --- a/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/tests/unit/plugins/modules/test_hello.py +++ b/test/integration/targets/ansible-test-docker/ansible_collections/ns/col/tests/unit/plugins/modules/test_hello.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from .....plugins.modules.hello import say_hello diff --git a/test/integration/targets/ansible-test-integration-targets/test.py b/test/integration/targets/ansible-test-integration-targets/test.py index 8effb647fca..10fa2d44f57 100755 --- a/test/integration/targets/ansible-test-integration-targets/test.py +++ b/test/integration/targets/ansible-test-integration-targets/test.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import annotations import subprocess import unittest diff --git a/test/integration/targets/ansible-test-integration/ansible_collections/ns/col/plugins/module_utils/my_util.py b/test/integration/targets/ansible-test-integration/ansible_collections/ns/col/plugins/module_utils/my_util.py index b9c531cf8aa..ff10e2d5218 100644 --- a/test/integration/targets/ansible-test-integration/ansible_collections/ns/col/plugins/module_utils/my_util.py +++ b/test/integration/targets/ansible-test-integration/ansible_collections/ns/col/plugins/module_utils/my_util.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations def hello(name): diff --git a/test/integration/targets/ansible-test-integration/ansible_collections/ns/col/plugins/modules/hello.py b/test/integration/targets/ansible-test-integration/ansible_collections/ns/col/plugins/modules/hello.py index 033b6c90f0e..06ff6d4bc67 100644 --- a/test/integration/targets/ansible-test-integration/ansible_collections/ns/col/plugins/modules/hello.py +++ b/test/integration/targets/ansible-test-integration/ansible_collections/ns/col/plugins/modules/hello.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: hello diff --git a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py index 463915284b2..b4ccb7b6513 100755 --- a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py +++ b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Run a command using a PTY.""" +from __future__ import annotations import sys diff --git a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py index a2b094e2fca..d7f3eb76e03 100755 --- a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py +++ b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Assert no TTY is available.""" +from __future__ import annotations import sys diff --git a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/vendored_pty.py b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/vendored_pty.py index bc70803b8d7..346bae3de9e 100644 --- a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/vendored_pty.py +++ b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/vendored_pty.py @@ -7,6 +7,7 @@ # See: W. Richard Stevens. 1992. Advanced Programming in the # UNIX Environment. Chapter 19. # Author: Steen Lumholt -- with additions by Guido. +from __future__ import annotations from select import select import os diff --git a/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/lookup/a/b/lookup2.py b/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/lookup/a/b/lookup2.py index 5cd2cf0f30f..950b26bc5a3 100644 --- a/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/lookup/a/b/lookup2.py +++ b/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/lookup/a/b/lookup2.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: lookup2 diff --git a/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/lookup/lookup1.py b/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/lookup/lookup1.py index e274f19f1b2..45d37f25f0d 100644 --- a/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/lookup/lookup1.py +++ b/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/lookup/lookup1.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ name: lookup1 diff --git a/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/modules/a/b/module2.py b/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/modules/a/b/module2.py index 6fafa193c3f..500beaa8732 100644 --- a/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/modules/a/b/module2.py +++ b/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/modules/a/b/module2.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: module2 diff --git a/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/modules/module1.py b/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/modules/module1.py index 8847f5b8558..45e39774384 100644 --- a/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/modules/module1.py +++ b/test/integration/targets/ansible-test-sanity-ansible-doc/ansible_collections/ns/col/plugins/modules/module1.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: module1 diff --git a/test/integration/targets/ansible-test-sanity-import/ansible_collections/ns/col/plugins/lookup/vendor1.py b/test/integration/targets/ansible-test-sanity-import/ansible_collections/ns/col/plugins/lookup/vendor1.py index f662b97d72f..3cf63c0a653 100644 --- a/test/integration/targets/ansible-test-sanity-import/ansible_collections/ns/col/plugins/lookup/vendor1.py +++ b/test/integration/targets/ansible-test-sanity-import/ansible_collections/ns/col/plugins/lookup/vendor1.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: vendor1 diff --git a/test/integration/targets/ansible-test-sanity-import/ansible_collections/ns/col/plugins/lookup/vendor2.py b/test/integration/targets/ansible-test-sanity-import/ansible_collections/ns/col/plugins/lookup/vendor2.py index 38860b031e2..d22f7184bd4 100644 --- a/test/integration/targets/ansible-test-sanity-import/ansible_collections/ns/col/plugins/lookup/vendor2.py +++ b/test/integration/targets/ansible-test-sanity-import/ansible_collections/ns/col/plugins/lookup/vendor2.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: vendor2 diff --git a/test/integration/targets/ansible-test-sanity-no-get-exception/ansible_collections/ns/col/do-not-check-me.py b/test/integration/targets/ansible-test-sanity-no-get-exception/ansible_collections/ns/col/do-not-check-me.py index ca25269938e..9d3779d54bd 100644 --- a/test/integration/targets/ansible-test-sanity-no-get-exception/ansible_collections/ns/col/do-not-check-me.py +++ b/test/integration/targets/ansible-test-sanity-no-get-exception/ansible_collections/ns/col/do-not-check-me.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from ansible.module_utils.pycompat24 import get_exception diff --git a/test/integration/targets/ansible-test-sanity-no-get-exception/ansible_collections/ns/col/plugins/modules/check-me.py b/test/integration/targets/ansible-test-sanity-no-get-exception/ansible_collections/ns/col/plugins/modules/check-me.py index ca25269938e..9d3779d54bd 100644 --- a/test/integration/targets/ansible-test-sanity-no-get-exception/ansible_collections/ns/col/plugins/modules/check-me.py +++ b/test/integration/targets/ansible-test-sanity-no-get-exception/ansible_collections/ns/col/plugins/modules/check-me.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from ansible.module_utils.pycompat24 import get_exception diff --git a/test/integration/targets/ansible-test-sanity-no-get-exception/expected.txt b/test/integration/targets/ansible-test-sanity-no-get-exception/expected.txt index 4c432cb184d..d076bb7b0a2 100644 --- a/test/integration/targets/ansible-test-sanity-no-get-exception/expected.txt +++ b/test/integration/targets/ansible-test-sanity-no-get-exception/expected.txt @@ -1,2 +1,2 @@ -plugins/modules/check-me.py:1:44: do not use `get_exception` -plugins/modules/check-me.py:5:4: do not use `get_exception` +plugins/modules/check-me.py:3:44: do not use `get_exception` +plugins/modules/check-me.py:7:4: do not use `get_exception` diff --git a/test/integration/targets/ansible-test-sanity-pylint/ansible_collections/ns/col/plugins/lookup/deprecated.py b/test/integration/targets/ansible-test-sanity-pylint/ansible_collections/ns/col/plugins/lookup/deprecated.py index b7908b6cbe5..1066e64917f 100644 --- a/test/integration/targets/ansible-test-sanity-pylint/ansible_collections/ns/col/plugins/lookup/deprecated.py +++ b/test/integration/targets/ansible-test-sanity-pylint/ansible_collections/ns/col/plugins/lookup/deprecated.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: deprecated diff --git a/test/integration/targets/ansible-test-sanity-pylint/expected.txt b/test/integration/targets/ansible-test-sanity-pylint/expected.txt index df7bbc20698..9c53a308e69 100644 --- a/test/integration/targets/ansible-test-sanity-pylint/expected.txt +++ b/test/integration/targets/ansible-test-sanity-pylint/expected.txt @@ -1 +1 @@ -plugins/lookup/deprecated.py:27:0: collection-deprecated-version: Deprecated version ('2.0.0') found in call to Display.deprecated or AnsibleModule.deprecate +plugins/lookup/deprecated.py:26:0: collection-deprecated-version: Deprecated version ('2.0.0') found in call to Display.deprecated or AnsibleModule.deprecate diff --git a/test/integration/targets/ansible-test-sanity-replace-urlopen/ansible_collections/ns/col/do-not-check-me.py b/test/integration/targets/ansible-test-sanity-replace-urlopen/ansible_collections/ns/col/do-not-check-me.py index 9b9c7e69c30..9f70d26941d 100644 --- a/test/integration/targets/ansible-test-sanity-replace-urlopen/ansible_collections/ns/col/do-not-check-me.py +++ b/test/integration/targets/ansible-test-sanity-replace-urlopen/ansible_collections/ns/col/do-not-check-me.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import urllib.request diff --git a/test/integration/targets/ansible-test-sanity-replace-urlopen/ansible_collections/ns/col/plugins/modules/check-me.py b/test/integration/targets/ansible-test-sanity-replace-urlopen/ansible_collections/ns/col/plugins/modules/check-me.py index 9b9c7e69c30..9f70d26941d 100644 --- a/test/integration/targets/ansible-test-sanity-replace-urlopen/ansible_collections/ns/col/plugins/modules/check-me.py +++ b/test/integration/targets/ansible-test-sanity-replace-urlopen/ansible_collections/ns/col/plugins/modules/check-me.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import urllib.request diff --git a/test/integration/targets/ansible-test-sanity-replace-urlopen/expected.txt b/test/integration/targets/ansible-test-sanity-replace-urlopen/expected.txt index 4dd1bfb06e6..45835fa3f85 100644 --- a/test/integration/targets/ansible-test-sanity-replace-urlopen/expected.txt +++ b/test/integration/targets/ansible-test-sanity-replace-urlopen/expected.txt @@ -1 +1 @@ -plugins/modules/check-me.py:5:20: use `ansible.module_utils.urls.open_url` instead of `urlopen` +plugins/modules/check-me.py:7:20: use `ansible.module_utils.urls.open_url` instead of `urlopen` diff --git a/test/integration/targets/ansible-test-sanity-use-compat-six/ansible_collections/ns/col/do-not-check-me.py b/test/integration/targets/ansible-test-sanity-use-compat-six/ansible_collections/ns/col/do-not-check-me.py index 7f7f9f58195..a3ea929f765 100644 --- a/test/integration/targets/ansible-test-sanity-use-compat-six/ansible_collections/ns/col/do-not-check-me.py +++ b/test/integration/targets/ansible-test-sanity-use-compat-six/ansible_collections/ns/col/do-not-check-me.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import six diff --git a/test/integration/targets/ansible-test-sanity-use-compat-six/ansible_collections/ns/col/plugins/modules/check-me.py b/test/integration/targets/ansible-test-sanity-use-compat-six/ansible_collections/ns/col/plugins/modules/check-me.py index 7f7f9f58195..a3ea929f765 100644 --- a/test/integration/targets/ansible-test-sanity-use-compat-six/ansible_collections/ns/col/plugins/modules/check-me.py +++ b/test/integration/targets/ansible-test-sanity-use-compat-six/ansible_collections/ns/col/plugins/modules/check-me.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import six diff --git a/test/integration/targets/ansible-test-sanity-use-compat-six/expected.txt b/test/integration/targets/ansible-test-sanity-use-compat-six/expected.txt index 42ba83ba8da..c3b005ded3b 100644 --- a/test/integration/targets/ansible-test-sanity-use-compat-six/expected.txt +++ b/test/integration/targets/ansible-test-sanity-use-compat-six/expected.txt @@ -1 +1 @@ -plugins/modules/check-me.py:1:1: use `ansible.module_utils.six` instead of `six` +plugins/modules/check-me.py:3:1: use `ansible.module_utils.six` instead of `six` diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_1.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_1.py index 1b23b490b08..7f53b26bea7 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_1.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_1.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: check_mode_attribute_1 diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_2.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_2.py index 0687e9f0b9f..263e5b82386 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_2.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_2.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: check_mode_attribute_2 diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_3.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_3.py index 61226e68bbe..a2bf6995681 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_3.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_3.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: check_mode_attribute_3 diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_4.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_4.py index 1cb7813762c..0d442e87296 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_4.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_4.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: check_mode_attribute_4 diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_5.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_5.py index a8d8556239e..86bc94f71f3 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_5.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_5.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: check_mode_attribute_5 diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_6.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_6.py index cd5a4fb18f7..966d62cc4fc 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_6.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_6.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: check_mode_attribute_6 diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_7.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_7.py index 73d976c24f3..0b77937f2b6 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_7.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/check_mode_attribute_7.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: check_mode_attribute_7 diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/import_order.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/import_order.py index f4f3c9b81d8..84c2ed9ba49 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/import_order.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/import_order.py @@ -1,9 +1,8 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/invalid_yaml_syntax.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/invalid_yaml_syntax.py index 5dd753f75a6..7931798945c 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/invalid_yaml_syntax.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/invalid_yaml_syntax.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' - key: "value"wrong diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/no_callable.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/no_callable.py index 176376abab4..7004c708459 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/no_callable.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/no_callable.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: no_callable diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/semantic_markup.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/semantic_markup.py index 587731d6115..86eca45f4e3 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/semantic_markup.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/semantic_markup.py @@ -1,9 +1,8 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = r''' module: semantic_markup diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/sidecar.py b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/sidecar.py index 8377c40d326..c5289b8f311 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/sidecar.py +++ b/test/integration/targets/ansible-test-sanity-validate-modules/ansible_collections/ns/col/plugins/modules/sidecar.py @@ -1,5 +1,6 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/ansible-test-sanity-validate-modules/expected.txt b/test/integration/targets/ansible-test-sanity-validate-modules/expected.txt index ca6e52a3875..93355b5fcef 100644 --- a/test/integration/targets/ansible-test-sanity-validate-modules/expected.txt +++ b/test/integration/targets/ansible-test-sanity-validate-modules/expected.txt @@ -3,12 +3,12 @@ plugins/modules/check_mode_attribute_1.py:0:0: attributes-check-mode: The module plugins/modules/check_mode_attribute_2.py:0:0: attributes-check-mode: The module does not declare support for check mode, but the check_mode attribute's support value is 'partial' and not 'none' plugins/modules/check_mode_attribute_3.py:0:0: attributes-check-mode: The module does declare support for check mode, but the check_mode attribute's support value is 'none' plugins/modules/check_mode_attribute_4.py:0:0: attributes-check-mode-details: The module declares it does not fully support check mode, but has no details on what exactly that means -plugins/modules/import_order.py:8:0: import-before-documentation: Import found before documentation variables. All imports must appear below DOCUMENTATION/EXAMPLES/RETURN. +plugins/modules/import_order.py:7:0: import-before-documentation: Import found before documentation variables. All imports must appear below DOCUMENTATION/EXAMPLES/RETURN. plugins/modules/invalid_yaml_syntax.py:0:0: deprecation-mismatch: "meta/runtime.yml" and DOCUMENTATION.deprecation do not agree. plugins/modules/invalid_yaml_syntax.py:0:0: missing-documentation: No DOCUMENTATION provided -plugins/modules/invalid_yaml_syntax.py:8:15: documentation-syntax-error: DOCUMENTATION is not valid YAML -plugins/modules/invalid_yaml_syntax.py:12:15: invalid-examples: EXAMPLES is not valid YAML -plugins/modules/invalid_yaml_syntax.py:16:15: return-syntax-error: RETURN is not valid YAML +plugins/modules/invalid_yaml_syntax.py:7:15: documentation-syntax-error: DOCUMENTATION is not valid YAML +plugins/modules/invalid_yaml_syntax.py:11:15: invalid-examples: EXAMPLES is not valid YAML +plugins/modules/invalid_yaml_syntax.py:15:15: return-syntax-error: RETURN is not valid YAML plugins/modules/semantic_markup.py:0:0: invalid-documentation-markup: DOCUMENTATION.options.a11.suboptions.b1.description.0: While parsing "V(C\(" at index 1: Unnecessarily escaped "(" @ data['options']['a11']['suboptions']['b1']['description'][0]. Got 'V(C\\(foo\\)).' plugins/modules/semantic_markup.py:0:0: invalid-documentation-markup: DOCUMENTATION.options.a11.suboptions.b1.description.2: While parsing "P(foo.bar#baz)" at index 1: Plugin name "foo.bar" is not a FQCN @ data['options']['a11']['suboptions']['b1']['description'][2]. Got 'P(foo.bar#baz).' plugins/modules/semantic_markup.py:0:0: invalid-documentation-markup: DOCUMENTATION.options.a11.suboptions.b1.description.3: While parsing "P(foo.bar.baz)" at index 1: Parameter "foo.bar.baz" is not of the form FQCN#type @ data['options']['a11']['suboptions']['b1']['description'][3]. Got 'P(foo.bar.baz).' diff --git a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/lookup/bad.py b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/lookup/bad.py index 16e0bc88566..617353b20e9 100644 --- a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/lookup/bad.py +++ b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/lookup/bad.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: bad diff --git a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/lookup/world.py b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/lookup/world.py index 5cdd096640a..093447d906b 100644 --- a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/lookup/world.py +++ b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/lookup/world.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: world diff --git a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/modules/bad.py b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/modules/bad.py index 8780e356c80..72d859adf18 100644 --- a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/modules/bad.py +++ b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/modules/bad.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: bad diff --git a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/plugin_utils/check_pylint.py b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/plugin_utils/check_pylint.py index 1fe4dfad1df..6ec9023478d 100644 --- a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/plugin_utils/check_pylint.py +++ b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/plugin_utils/check_pylint.py @@ -2,8 +2,7 @@ These test cases verify ansible-test version constraints for pylint and its dependencies across Python versions. The initial test cases were discovered while testing various Python versions against ansible/ansible. """ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations # Python 3.8 fails with astroid 2.2.5 but works on 2.3.3 # syntax-error: Cannot import 'string' due to syntax error 'invalid syntax (<unknown>, line 109)' diff --git a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/random_directory/bad.py b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/random_directory/bad.py index e34d1c378da..ec2aefa4417 100644 --- a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/random_directory/bad.py +++ b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/plugins/random_directory/bad.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations # This is not an allowed import, but since this file is in a plugins/ subdirectory that is not checked, # the import sanity test will not complain. diff --git a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/tests/integration/targets/hello/files/bad.py b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/tests/integration/targets/hello/files/bad.py index a5d896f7fc5..d7931965939 100644 --- a/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/tests/integration/targets/hello/files/bad.py +++ b/test/integration/targets/ansible-test-sanity/ansible_collections/ns/col/tests/integration/targets/hello/files/bad.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import tempfile diff --git a/test/integration/targets/ansible-test-units-assertions/ansible_collections/ns/col/tests/unit/plugins/modules/test_assertion.py b/test/integration/targets/ansible-test-units-assertions/ansible_collections/ns/col/tests/unit/plugins/modules/test_assertion.py index e172200410f..6b60ae6421d 100644 --- a/test/integration/targets/ansible-test-units-assertions/ansible_collections/ns/col/tests/unit/plugins/modules/test_assertion.py +++ b/test/integration/targets/ansible-test-units-assertions/ansible_collections/ns/col/tests/unit/plugins/modules/test_assertion.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations def test_assertion(): diff --git a/test/integration/targets/ansible-test-units-constraints/ansible_collections/ns/col/tests/unit/plugins/modules/test_constraints.py b/test/integration/targets/ansible-test-units-constraints/ansible_collections/ns/col/tests/unit/plugins/modules/test_constraints.py index 857e8e557ff..2b501019e10 100644 --- a/test/integration/targets/ansible-test-units-constraints/ansible_collections/ns/col/tests/unit/plugins/modules/test_constraints.py +++ b/test/integration/targets/ansible-test-units-constraints/ansible_collections/ns/col/tests/unit/plugins/modules/test_constraints.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import botocore diff --git a/test/integration/targets/ansible-test-units-forked/ansible_collections/ns/col/tests/unit/plugins/modules/test_ansible_forked.py b/test/integration/targets/ansible-test-units-forked/ansible_collections/ns/col/tests/unit/plugins/modules/test_ansible_forked.py index 828099c65e4..8ce7d434493 100644 --- a/test/integration/targets/ansible-test-units-forked/ansible_collections/ns/col/tests/unit/plugins/modules/test_ansible_forked.py +++ b/test/integration/targets/ansible-test-units-forked/ansible_collections/ns/col/tests/unit/plugins/modules/test_ansible_forked.py @@ -1,7 +1,6 @@ """Unit tests to verify the functionality of the ansible-forked pytest plugin.""" -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import os import pytest diff --git a/test/integration/targets/ansible-test-units/ansible_collections/ns/col/plugins/module_utils/my_util.py b/test/integration/targets/ansible-test-units/ansible_collections/ns/col/plugins/module_utils/my_util.py index b9c531cf8aa..ff10e2d5218 100644 --- a/test/integration/targets/ansible-test-units/ansible_collections/ns/col/plugins/module_utils/my_util.py +++ b/test/integration/targets/ansible-test-units/ansible_collections/ns/col/plugins/module_utils/my_util.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations def hello(name): diff --git a/test/integration/targets/ansible-test-units/ansible_collections/ns/col/plugins/modules/hello.py b/test/integration/targets/ansible-test-units/ansible_collections/ns/col/plugins/modules/hello.py index 033b6c90f0e..06ff6d4bc67 100644 --- a/test/integration/targets/ansible-test-units/ansible_collections/ns/col/plugins/modules/hello.py +++ b/test/integration/targets/ansible-test-units/ansible_collections/ns/col/plugins/modules/hello.py @@ -1,8 +1,7 @@ #!/usr/bin/python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' module: hello diff --git a/test/integration/targets/ansible-test-units/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_my_util.py b/test/integration/targets/ansible-test-units/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_my_util.py index 7df87103767..84a49ac381d 100644 --- a/test/integration/targets/ansible-test-units/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_my_util.py +++ b/test/integration/targets/ansible-test-units/ansible_collections/ns/col/tests/unit/plugins/module_utils/test_my_util.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from .....plugins.module_utils.my_util import hello diff --git a/test/integration/targets/ansible-test-units/ansible_collections/ns/col/tests/unit/plugins/modules/test_hello.py b/test/integration/targets/ansible-test-units/ansible_collections/ns/col/tests/unit/plugins/modules/test_hello.py index 95ee0574fac..46c9de1976e 100644 --- a/test/integration/targets/ansible-test-units/ansible_collections/ns/col/tests/unit/plugins/modules/test_hello.py +++ b/test/integration/targets/ansible-test-units/ansible_collections/ns/col/tests/unit/plugins/modules/test_hello.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from .....plugins.modules.hello import say_hello diff --git a/test/integration/targets/ansible-test/venv-pythons.py b/test/integration/targets/ansible-test/venv-pythons.py index 97998bcd7c2..a22ff2803ba 100755 --- a/test/integration/targets/ansible-test/venv-pythons.py +++ b/test/integration/targets/ansible-test/venv-pythons.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Return target Python options for use with ansible-test.""" +from __future__ import annotations import argparse import os diff --git a/test/integration/targets/ansible-vault/faux-editor.py b/test/integration/targets/ansible-vault/faux-editor.py index b67c7475631..fdf01ebc02c 100755 --- a/test/integration/targets/ansible-vault/faux-editor.py +++ b/test/integration/targets/ansible-vault/faux-editor.py @@ -16,8 +16,7 @@ # ansible-vault is a script that encrypts/decrypts YAML files. See # https://docs.ansible.com/ansible/latest/user_guide/vault.html for more details. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys import time diff --git a/test/integration/targets/ansible-vault/password-script.py b/test/integration/targets/ansible-vault/password-script.py index 1b7f02beb23..a65b01dc03c 100755 --- a/test/integration/targets/ansible-vault/password-script.py +++ b/test/integration/targets/ansible-vault/password-script.py @@ -16,8 +16,7 @@ # ansible-vault is a script that encrypts/decrypts YAML files. See # https://docs.ansible.com/ansible/latest/user_guide/vault.html for more details. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/integration/targets/ansible-vault/test-vault-client.py b/test/integration/targets/ansible-vault/test-vault-client.py index ee46188742d..c16e309a6e1 100755 --- a/test/integration/targets/ansible-vault/test-vault-client.py +++ b/test/integration/targets/ansible-vault/test-vault-client.py @@ -1,8 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'status': ['preview'], 'supported_by': 'community', diff --git a/test/integration/targets/ansible/callback_plugins/callback_meta.py b/test/integration/targets/ansible/callback_plugins/callback_meta.py index e19c80f2664..2494b1481dd 100644 --- a/test/integration/targets/ansible/callback_plugins/callback_meta.py +++ b/test/integration/targets/ansible/callback_plugins/callback_meta.py @@ -1,8 +1,7 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.callback import CallbackBase import os diff --git a/test/integration/targets/argspec/library/argspec.py b/test/integration/targets/argspec/library/argspec.py index 2d86d77ba79..6db16d7ed0d 100644 --- a/test/integration/targets/argspec/library/argspec.py +++ b/test/integration/targets/argspec/library/argspec.py @@ -2,8 +2,7 @@ # Copyright: (c) 2020, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/async/library/async_test.py b/test/integration/targets/async/library/async_test.py index f89bd10e74c..3905679dbd1 100644 --- a/test/integration/targets/async/library/async_test.py +++ b/test/integration/targets/async/library/async_test.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/async_extra_data/library/junkping.py b/test/integration/targets/async_extra_data/library/junkping.py index b61d965da90..6ad3c112d2f 100644 --- a/test/integration/targets/async_extra_data/library/junkping.py +++ b/test/integration/targets/async_extra_data/library/junkping.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/async_fail/action_plugins/normal.py b/test/integration/targets/async_fail/action_plugins/normal.py index 297cbd9b9b1..a288290ba2c 100644 --- a/test/integration/targets/async_fail/action_plugins/normal.py +++ b/test/integration/targets/async_fail/action_plugins/normal.py @@ -14,8 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleError from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/async_fail/library/async_test.py b/test/integration/targets/async_fail/library/async_test.py index e0cbd6fee51..e94a6a52e0b 100644 --- a/test/integration/targets/async_fail/library/async_test.py +++ b/test/integration/targets/async_fail/library/async_test.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/become_unprivileged/action_plugins/tmpdir.py b/test/integration/targets/become_unprivileged/action_plugins/tmpdir.py index b7cbb7a7e41..8985961a03d 100644 --- a/test/integration/targets/become_unprivileged/action_plugins/tmpdir.py +++ b/test/integration/targets/become_unprivileged/action_plugins/tmpdir.py @@ -1,6 +1,4 @@ -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py b/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py index 93958fc2adb..435a7eb979a 100644 --- a/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py +++ b/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import pexpect diff --git a/test/integration/targets/cli/test-cli.py b/test/integration/targets/cli/test-cli.py index 9893d6652ed..8d961ff36bb 100644 --- a/test/integration/targets/cli/test-cli.py +++ b/test/integration/targets/cli/test-cli.py @@ -2,9 +2,7 @@ # Copyright (c) 2019 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/integration/targets/cli/test_k_and_K.py b/test/integration/targets/cli/test_k_and_K.py index f7077fba0ab..fe9575c0b20 100644 --- a/test/integration/targets/cli/test_k_and_K.py +++ b/test/integration/targets/cli/test_k_and_K.py @@ -1,9 +1,7 @@ #!/usr/bin/env python # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import sys diff --git a/test/integration/targets/collection/update-ignore.py b/test/integration/targets/collection/update-ignore.py index 92a702cf13e..fb363f1274b 100755 --- a/test/integration/targets/collection/update-ignore.py +++ b/test/integration/targets/collection/update-ignore.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Rewrite a sanity ignore file to expand Python versions for import ignores and write the file out with the correct Ansible version in the name.""" +from __future__ import annotations import os import sys diff --git a/test/integration/targets/collections/ansiballz_dupe/collections/ansible_collections/duplicate/name/plugins/modules/ping.py b/test/integration/targets/collections/ansiballz_dupe/collections/ansible_collections/duplicate/name/plugins/modules/ping.py index d0fdba76781..116714962b1 100644 --- a/test/integration/targets/collections/ansiballz_dupe/collections/ansible_collections/duplicate/name/plugins/modules/ping.py +++ b/test/integration/targets/collections/ansiballz_dupe/collections/ansible_collections/duplicate/name/plugins/modules/ping.py @@ -1,3 +1,5 @@ #!/usr/bin/python +from __future__ import annotations + from ansible.module_utils.basic import AnsibleModule AnsibleModule({}).exit_json(ping='duplicate.name.pong') diff --git a/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/coll_in_sys/plugins/modules/systestmodule.py b/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/coll_in_sys/plugins/modules/systestmodule.py index cba38120e78..eb05be27efc 100644 --- a/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/coll_in_sys/plugins/modules/systestmodule.py +++ b/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/coll_in_sys/plugins/modules/systestmodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/testcoll/plugins/modules/maskedmodule.py b/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/testcoll/plugins/modules/maskedmodule.py index e3db81be343..9694c59ea57 100644 --- a/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/testcoll/plugins/modules/maskedmodule.py +++ b/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/testcoll/plugins/modules/maskedmodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/testcoll/plugins/modules/testmodule.py b/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/testcoll/plugins/modules/testmodule.py index cba38120e78..eb05be27efc 100644 --- a/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/testcoll/plugins/modules/testmodule.py +++ b/test/integration/targets/collections/collection_root_sys/ansible_collections/testns/testcoll/plugins/modules/testmodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/ansible/builtin/plugins/modules/ping.py b/test/integration/targets/collections/collection_root_user/ansible_collections/ansible/builtin/plugins/modules/ping.py index 07476709299..a6ff4494117 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/ansible/builtin/plugins/modules/ping.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/ansible/builtin/plugins/modules/ping.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/ansible/bullcoll/plugins/modules/bullmodule.py b/test/integration/targets/collections/collection_root_user/ansible_collections/ansible/bullcoll/plugins/modules/bullmodule.py index 5ea354e7d04..b19093022d5 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/ansible/bullcoll/plugins/modules/bullmodule.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/ansible/bullcoll/plugins/modules/bullmodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testbroken/plugins/filter/broken_filter.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testbroken/plugins/filter/broken_filter.py index 51fe8524500..9ffb201496d 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testbroken/plugins/filter/broken_filter.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testbroken/plugins/filter/broken_filter.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class FilterModule(object): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/playbooks/roles/non_coll_role/library/embedded_module.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/playbooks/roles/non_coll_role/library/embedded_module.py index 54402d12165..76c1f525bc2 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/playbooks/roles/non_coll_role/library/embedded_module.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/playbooks/roles/non_coll_role/library/embedded_module.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/action_subdir/subdir_ping_action.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/action_subdir/subdir_ping_action.py index 5af73342779..2d108e2a664 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/action_subdir/subdir_ping_action.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/action_subdir/subdir_ping_action.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/bypass_host_loop.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/bypass_host_loop.py index b15493d9c78..2625e1c736c 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/bypass_host_loop.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/bypass_host_loop.py @@ -1,8 +1,7 @@ # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/plugin_lookup.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/plugin_lookup.py index 3fa41e8f5f7..950e04c4d0b 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/plugin_lookup.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/plugin_lookup.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase from ansible.plugins import loader diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/subclassed_normal.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/subclassed_normal.py index f0eff30bf30..a35a0b79fd7 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/subclassed_normal.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/subclassed_normal.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action.normal import ActionModule as NormalAction diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/uses_redirected_import.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/uses_redirected_import.py index 701d7b468eb..4c36ab42785 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/uses_redirected_import.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/action/uses_redirected_import.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase from ansible.module_utils.formerly_core import thingtocall diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/callback/usercallback.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/callback/usercallback.py index b534df2f2a4..3eb9764a854 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/callback/usercallback.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/callback/usercallback.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.callback import CallbackBase diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/connection/localconn.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/connection/localconn.py index 77f80502bdc..28720059f7a 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/connection/localconn.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/connection/localconn.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.text.converters import to_native from ansible.plugins.connection import ConnectionBase diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/doc_fragments/frag.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/doc_fragments/frag.py index 4549f2d683e..8fbcb360cea 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/doc_fragments/frag.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/doc_fragments/frag.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/filter_subdir/my_subdir_filters.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/filter_subdir/my_subdir_filters.py index a5498a43efd..c8e4f84884c 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/filter_subdir/my_subdir_filters.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/filter_subdir/my_subdir_filters.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def test_subdir_filter(data): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/myfilters.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/myfilters.py index 0ce239e2f0c..ea56506a701 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/myfilters.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/myfilters.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def testfilter(data): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/myfilters2.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/myfilters2.py index 07239222155..29e22d3458e 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/myfilters2.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/filter/myfilters2.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def testfilter2(data): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/lookup_subdir/my_subdir_lookup.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/lookup_subdir/my_subdir_lookup.py index dd9818c964c..f6d65750a44 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/lookup_subdir/my_subdir_lookup.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/lookup_subdir/my_subdir_lookup.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.lookup import LookupBase diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/mylookup.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/mylookup.py index 1cf3d28f8cc..a8438509271 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/mylookup.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/mylookup.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.lookup import LookupBase diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/mylookup2.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/mylookup2.py index bda671f579e..2ca2de3ff39 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/mylookup2.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/lookup/mylookup2.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.lookup import LookupBase diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/base.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/base.py index 0654d182651..778c2beedc6 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/base.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/base.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible_collections.testns.testcoll.plugins.module_utils import secondary import ansible_collections.testns.testcoll.plugins.module_utils.secondary diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/leaf.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/leaf.py index ad847105f18..8ccc89ada23 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/leaf.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/leaf.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def thingtocall(): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/nested_same/nested_same/nested_same.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/nested_same/nested_same/nested_same.py index 774075646ac..aeb55ab5d3e 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/nested_same/nested_same/nested_same.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/nested_same/nested_same/nested_same.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def nested_same(): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/secondary.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/secondary.py index 9a315686adb..a7d7c5e0e57 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/secondary.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/secondary.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def thingtocall(): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg/submod.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg/submod.py index 3c24bc4458d..dbf27a8ad70 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg/submod.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg/submod.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def thingtocall(): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init.py index b48a717caeb..8bcb9363c86 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init.py @@ -1,6 +1,5 @@ # NB: this module should never be loaded, since we'll see the subpkg_with_init package dir first -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def thingtocall(): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init/__init__.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init/__init__.py index d424796f817..665c96a4dce 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init/__init__.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init/__init__.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # exercise relative imports in package init; they behave differently from .mod_in_subpkg_with_init import thingtocall as submod_thingtocall diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init/mod_in_subpkg_with_init.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init/mod_in_subpkg_with_init.py index 27747dae988..8fab6723ae8 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init/mod_in_subpkg_with_init.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/module_utils/subpkg_with_init/mod_in_subpkg_with_init.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def thingtocall(): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/deprecated_ping.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/deprecated_ping.py index 9698ba6f071..0dd956a7475 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/deprecated_ping.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/deprecated_ping.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/module_subdir/subdir_ping_module.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/module_subdir/subdir_ping_module.py index 5a70174d6d9..05d8d123e70 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/module_subdir/subdir_ping_module.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/module_subdir/subdir_ping_module.py @@ -1,7 +1,6 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/ping.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/ping.py index 2ca079c6407..fc8568e0e32 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/ping.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/ping.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/testmodule.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/testmodule.py index e2efadaec8c..6ec24b4e956 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/testmodule.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/testmodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/testmodule_bad_docfrags.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/testmodule_bad_docfrags.py index 46ccb76c745..d39efc8d221 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/testmodule_bad_docfrags.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/testmodule_bad_docfrags.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_base_mu_granular_nested_import.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_base_mu_granular_nested_import.py index 4054e36fb88..23d214da4f5 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_base_mu_granular_nested_import.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_base_mu_granular_nested_import.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_collection_redirected_mu.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_collection_redirected_mu.py index b169fdea3af..902003663c2 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_collection_redirected_mu.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_collection_redirected_mu.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_core_redirected_mu.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_core_redirected_mu.py index 28a077293ad..c735dbff5a8 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_core_redirected_mu.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_core_redirected_mu.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_flat_import.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_flat_import.py index 295d4329dcf..c96028aa100 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_flat_import.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_flat_import.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_granular_import.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_granular_import.py index 3794f496b9a..1327af97f09 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_granular_import.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_granular_import.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_module_import_from.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_module_import_from.py index 559e3e56c39..ae4bb237236 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_module_import_from.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_leaf_mu_module_import_from.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing.py index 6f3a19d77f7..1d8c0c325a7 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ..module_utils import bogusmu # pylint: disable=relative-beyond-top-level,unused-import diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing_redirect_collection.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing_redirect_collection.py index 6f2320d392e..c76e0e92ada 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing_redirect_collection.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing_redirect_collection.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ..module_utils import missing_redirect_target_collection # pylint: disable=relative-beyond-top-level,unused-import diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing_redirect_module.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing_redirect_module.py index de5c2e580fa..e7fce3e3e41 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing_redirect_module.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_mu_missing_redirect_module.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ..module_utils import missing_redirect_target_module # pylint: disable=relative-beyond-top-level,unused-import diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_nested_same_as_func.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_nested_same_as_func.py index 26fa53c0779..f757666c12f 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_nested_same_as_func.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_nested_same_as_func.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_nested_same_as_module.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_nested_same_as_module.py index e017c14f8ea..91ecfea2fb0 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_nested_same_as_module.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/modules/uses_nested_same_as_module.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/mytests.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/mytests.py index ba610fb2bdb..294a215cc32 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/mytests.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/mytests.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def testtest(data): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/mytests2.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/mytests2.py index 183944ff449..05c969d74a0 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/mytests2.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/mytests2.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def testtest(data): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/test_subdir/my_subdir_tests.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/test_subdir/my_subdir_tests.py index 98a8f893f1b..a28fb52348f 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/test_subdir/my_subdir_tests.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/test/test_subdir/my_subdir_tests.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def subdir_test(data): diff --git a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/vars/custom_vars.py b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/vars/custom_vars.py index da4e776c23b..e1997ae74e3 100644 --- a/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/vars/custom_vars.py +++ b/test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/plugins/vars/custom_vars.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . ############################################# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' vars: custom_vars diff --git a/test/integration/targets/collections/collections/ansible_collections/me/mycoll1/plugins/action/action1.py b/test/integration/targets/collections/collections/ansible_collections/me/mycoll1/plugins/action/action1.py index e9f97311f57..43f8ec32932 100644 --- a/test/integration/targets/collections/collections/ansible_collections/me/mycoll1/plugins/action/action1.py +++ b/test/integration/targets/collections/collections/ansible_collections/me/mycoll1/plugins/action/action1.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/collections/collections/ansible_collections/me/mycoll1/plugins/modules/action1.py b/test/integration/targets/collections/collections/ansible_collections/me/mycoll1/plugins/modules/action1.py index 66bb5a41bf8..03b165169b9 100644 --- a/test/integration/targets/collections/collections/ansible_collections/me/mycoll1/plugins/modules/action1.py +++ b/test/integration/targets/collections/collections/ansible_collections/me/mycoll1/plugins/modules/action1.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/integration/targets/collections/collections/ansible_collections/me/mycoll2/plugins/modules/module1.py b/test/integration/targets/collections/collections/ansible_collections/me/mycoll2/plugins/modules/module1.py index 00bb993be0d..b0d3f6da3c8 100644 --- a/test/integration/targets/collections/collections/ansible_collections/me/mycoll2/plugins/modules/module1.py +++ b/test/integration/targets/collections/collections/ansible_collections/me/mycoll2/plugins/modules/module1.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/cache/custom_jsonfile.py b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/cache/custom_jsonfile.py index 7605dc41112..393a43f81b3 100644 --- a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/cache/custom_jsonfile.py +++ b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/cache/custom_jsonfile.py @@ -2,9 +2,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' cache: jsonfile diff --git a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/inventory/statichost.py b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/inventory/statichost.py index 92696481ba5..b2405e322e0 100644 --- a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/inventory/statichost.py +++ b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/inventory/statichost.py @@ -1,8 +1,7 @@ # Copyright (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' inventory: statichost diff --git a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/module_utils/sub1/foomodule.py b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/module_utils/sub1/foomodule.py index eeffe01e298..baf44852ec2 100644 --- a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/module_utils/sub1/foomodule.py +++ b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/module_utils/sub1/foomodule.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def importme(): diff --git a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/modules/contentadjmodule.py b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/modules/contentadjmodule.py index 0fa98eb02d1..a7f7f003921 100644 --- a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/modules/contentadjmodule.py +++ b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/modules/contentadjmodule.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/vars/custom_adj_vars.py b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/vars/custom_adj_vars.py index 0cd9a1d5fd3..b98fe7bba2c 100644 --- a/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/vars/custom_adj_vars.py +++ b/test/integration/targets/collections/collections/ansible_collections/testns/content_adj/plugins/vars/custom_adj_vars.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . ############################################# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' vars: custom_adj_vars diff --git a/test/integration/targets/collections/custom_vars_plugins/v1_vars_plugin.py b/test/integration/targets/collections/custom_vars_plugins/v1_vars_plugin.py index b5792d88d79..b9e2925ba43 100644 --- a/test/integration/targets/collections/custom_vars_plugins/v1_vars_plugin.py +++ b/test/integration/targets/collections/custom_vars_plugins/v1_vars_plugin.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . ############################################# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' vars: v1_vars_plugin diff --git a/test/integration/targets/collections/custom_vars_plugins/v2_vars_plugin.py b/test/integration/targets/collections/custom_vars_plugins/v2_vars_plugin.py index fc140162167..c946e440e1a 100644 --- a/test/integration/targets/collections/custom_vars_plugins/v2_vars_plugin.py +++ b/test/integration/targets/collections/custom_vars_plugins/v2_vars_plugin.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . ############################################# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' vars: v2_vars_plugin diff --git a/test/integration/targets/collections/filter_plugins/override_formerly_core_masked_filter.py b/test/integration/targets/collections/filter_plugins/override_formerly_core_masked_filter.py index 600b1fd8c2b..228de4214d9 100644 --- a/test/integration/targets/collections/filter_plugins/override_formerly_core_masked_filter.py +++ b/test/integration/targets/collections/filter_plugins/override_formerly_core_masked_filter.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def override_formerly_core_masked_filter(*args, **kwargs): diff --git a/test/integration/targets/collections/library/ping.py b/test/integration/targets/collections/library/ping.py index 7a416a64879..d77057791f0 100644 --- a/test/integration/targets/collections/library/ping.py +++ b/test/integration/targets/collections/library/ping.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/collections/test_plugins/override_formerly_core_masked_test.py b/test/integration/targets/collections/test_plugins/override_formerly_core_masked_test.py index 11c7f7a7e31..3a70685a095 100644 --- a/test/integration/targets/collections/test_plugins/override_formerly_core_masked_test.py +++ b/test/integration/targets/collections/test_plugins/override_formerly_core_masked_test.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def override_formerly_core_masked_test(value, *args, **kwargs): diff --git a/test/integration/targets/collections/test_task_resolved_plugin/action_plugins/legacy_action.py b/test/integration/targets/collections/test_task_resolved_plugin/action_plugins/legacy_action.py index fa4d514b0a5..da8192813a7 100644 --- a/test/integration/targets/collections/test_task_resolved_plugin/action_plugins/legacy_action.py +++ b/test/integration/targets/collections/test_task_resolved_plugin/action_plugins/legacy_action.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/collections/test_task_resolved_plugin/callback_plugins/display_resolved_action.py b/test/integration/targets/collections/test_task_resolved_plugin/callback_plugins/display_resolved_action.py index f1242e145de..ba71668426d 100644 --- a/test/integration/targets/collections/test_task_resolved_plugin/callback_plugins/display_resolved_action.py +++ b/test/integration/targets/collections/test_task_resolved_plugin/callback_plugins/display_resolved_action.py @@ -1,8 +1,7 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: display_resolved_action diff --git a/test/integration/targets/collections/test_task_resolved_plugin/collections/ansible_collections/test_ns/test_coll/plugins/action/collection_action.py b/test/integration/targets/collections/test_task_resolved_plugin/collections/ansible_collections/test_ns/test_coll/plugins/action/collection_action.py index fa4d514b0a5..da8192813a7 100644 --- a/test/integration/targets/collections/test_task_resolved_plugin/collections/ansible_collections/test_ns/test_coll/plugins/action/collection_action.py +++ b/test/integration/targets/collections/test_task_resolved_plugin/collections/ansible_collections/test_ns/test_coll/plugins/action/collection_action.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/collections/test_task_resolved_plugin/collections/ansible_collections/test_ns/test_coll/plugins/modules/collection_module.py b/test/integration/targets/collections/test_task_resolved_plugin/collections/ansible_collections/test_ns/test_coll/plugins/modules/collection_module.py index 8f3122638d1..ddfa9097f70 100644 --- a/test/integration/targets/collections/test_task_resolved_plugin/collections/ansible_collections/test_ns/test_coll/plugins/modules/collection_module.py +++ b/test/integration/targets/collections/test_task_resolved_plugin/collections/ansible_collections/test_ns/test_coll/plugins/modules/collection_module.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' --- diff --git a/test/integration/targets/collections/test_task_resolved_plugin/library/legacy_module.py b/test/integration/targets/collections/test_task_resolved_plugin/library/legacy_module.py index 4fd75871d71..98fccbbdf42 100644 --- a/test/integration/targets/collections/test_task_resolved_plugin/library/legacy_module.py +++ b/test/integration/targets/collections/test_task_resolved_plugin/library/legacy_module.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' --- diff --git a/test/integration/targets/collections/testcoll2/plugins/modules/testmodule2.py b/test/integration/targets/collections/testcoll2/plugins/modules/testmodule2.py index 7f6eb0247b1..f8db43ec1b7 100644 --- a/test/integration/targets/collections/testcoll2/plugins/modules/testmodule2.py +++ b/test/integration/targets/collections/testcoll2/plugins/modules/testmodule2.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], diff --git a/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/filter/test_filter.py b/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/filter/test_filter.py index dca094be8a4..aea1bba7a14 100644 --- a/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/filter/test_filter.py +++ b/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/filter/test_filter.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def filter_name(a): diff --git a/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/lookup/lookup_name.py b/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/lookup/lookup_name.py index d0af703bbdc..4a8d0422a47 100644 --- a/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/lookup/lookup_name.py +++ b/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/lookup/lookup_name.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.lookup import LookupBase diff --git a/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/lookup/lookup_no_future_boilerplate.py b/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/lookup/lookup_no_future_boilerplate.py index 79e80f625ae..5dda8b231ec 100644 --- a/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/lookup/lookup_no_future_boilerplate.py +++ b/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/lookup/lookup_no_future_boilerplate.py @@ -1,6 +1,6 @@ # do not add future boilerplate to this plugin # specifically, do not add absolute_import, as the purpose of this plugin is to test implicit relative imports on Python 2.x -__metaclass__ = type +from __future__ import annotations from ansible.plugins.lookup import LookupBase diff --git a/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/test/test_test.py b/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/test/test_test.py index 1739072f9d9..bec061df3e4 100644 --- a/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/test/test_test.py +++ b/test/integration/targets/collections_plugin_namespace/collection_root/ansible_collections/my_ns/my_col/plugins/test/test_test.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def test_name_ok(value): diff --git a/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util1.py b/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util1.py index 196b4abf546..6da2705c9fb 100644 --- a/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util1.py +++ b/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util1.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations def one(): diff --git a/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util2.py b/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util2.py index 0d985bf37ca..50baed04b15 100644 --- a/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util2.py +++ b/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util2.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from .my_util1 import one diff --git a/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util3.py b/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util3.py index 1529d7b274a..f04b8702d3e 100644 --- a/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util3.py +++ b/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/module_utils/my_util3.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from . import my_util2 diff --git a/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/modules/my_module.py b/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/modules/my_module.py index 0cdf50089a7..e3848eb8b44 100644 --- a/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/modules/my_module.py +++ b/test/integration/targets/collections_relative_imports/collection_root/ansible_collections/my_ns/my_col/plugins/modules/my_module.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule from ..module_utils.my_util2 import two diff --git a/test/integration/targets/collections_runtime_pythonpath/ansible-collection-python-dist-boo/ansible_collections/python/dist/plugins/modules/boo.py b/test/integration/targets/collections_runtime_pythonpath/ansible-collection-python-dist-boo/ansible_collections/python/dist/plugins/modules/boo.py index a2313b127d2..a70c606b182 100644 --- a/test/integration/targets/collections_runtime_pythonpath/ansible-collection-python-dist-boo/ansible_collections/python/dist/plugins/modules/boo.py +++ b/test/integration/targets/collections_runtime_pythonpath/ansible-collection-python-dist-boo/ansible_collections/python/dist/plugins/modules/boo.py @@ -2,8 +2,7 @@ """Say hello.""" -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/collections_runtime_pythonpath/ansible-collection-python-dist-foo/ansible_collections/python/dist/plugins/modules/boo.py b/test/integration/targets/collections_runtime_pythonpath/ansible-collection-python-dist-foo/ansible_collections/python/dist/plugins/modules/boo.py index 1ef033303b0..415e826e946 100644 --- a/test/integration/targets/collections_runtime_pythonpath/ansible-collection-python-dist-foo/ansible_collections/python/dist/plugins/modules/boo.py +++ b/test/integration/targets/collections_runtime_pythonpath/ansible-collection-python-dist-foo/ansible_collections/python/dist/plugins/modules/boo.py @@ -2,8 +2,7 @@ """Say hello in Ukrainian.""" -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/common_network/test_plugins/is_mac.py b/test/integration/targets/common_network/test_plugins/is_mac.py index 6a4d4092cd6..62672814afd 100644 --- a/test/integration/targets/common_network/test_plugins/is_mac.py +++ b/test/integration/targets/common_network/test_plugins/is_mac.py @@ -1,8 +1,7 @@ # Copyright: (c) 2020, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.network import is_mac diff --git a/test/integration/targets/config/lookup_plugins/bogus.py b/test/integration/targets/config/lookup_plugins/bogus.py index 34dc98a24c4..3a31c35338d 100644 --- a/test/integration/targets/config/lookup_plugins/bogus.py +++ b/test/integration/targets/config/lookup_plugins/bogus.py @@ -1,10 +1,8 @@ # (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """ name: bogus diff --git a/test/integration/targets/config/lookup_plugins/types.py b/test/integration/targets/config/lookup_plugins/types.py index d3092296870..8fb42f8fb0b 100644 --- a/test/integration/targets/config/lookup_plugins/types.py +++ b/test/integration/targets/config/lookup_plugins/types.py @@ -1,10 +1,8 @@ # (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """ name: types diff --git a/test/integration/targets/connection_delegation/action_plugins/delegation_action.py b/test/integration/targets/connection_delegation/action_plugins/delegation_action.py index 9d419e75b08..3a8e1ca2c9f 100644 --- a/test/integration/targets/connection_delegation/action_plugins/delegation_action.py +++ b/test/integration/targets/connection_delegation/action_plugins/delegation_action.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/connection_delegation/connection_plugins/delegation_connection.py b/test/integration/targets/connection_delegation/connection_plugins/delegation_connection.py index f61846cfab3..4a7e1d33ec8 100644 --- a/test/integration/targets/connection_delegation/connection_plugins/delegation_connection.py +++ b/test/integration/targets/connection_delegation/connection_plugins/delegation_connection.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ author: Ansible Core Team diff --git a/test/integration/targets/connection_remote_is_local/connection_plugins/remote_is_local.py b/test/integration/targets/connection_remote_is_local/connection_plugins/remote_is_local.py index 818bca47ab4..20a309fa350 100644 --- a/test/integration/targets/connection_remote_is_local/connection_plugins/remote_is_local.py +++ b/test/integration/targets/connection_remote_is_local/connection_plugins/remote_is_local.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/debugger/test_run_once.py b/test/integration/targets/debugger/test_run_once.py index 237f9c2d903..0b65c42492b 100755 --- a/test/integration/targets/debugger/test_run_once.py +++ b/test/integration/targets/debugger/test_run_once.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import annotations import io import os diff --git a/test/integration/targets/delegate_to/connection_plugins/fakelocal.py b/test/integration/targets/delegate_to/connection_plugins/fakelocal.py index 59ddcf05eee..e0ecdfde5f3 100644 --- a/test/integration/targets/delegate_to/connection_plugins/fakelocal.py +++ b/test/integration/targets/delegate_to/connection_plugins/fakelocal.py @@ -1,7 +1,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' connection: fakelocal diff --git a/test/integration/targets/delegate_to/library/detect_interpreter.py b/test/integration/targets/delegate_to/library/detect_interpreter.py index 1f4016772ac..381ab7e83c6 100644 --- a/test/integration/targets/delegate_to/library/detect_interpreter.py +++ b/test/integration/targets/delegate_to/library/detect_interpreter.py @@ -1,8 +1,7 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import sys diff --git a/test/integration/targets/dict_transformations/library/convert_camelCase.py b/test/integration/targets/dict_transformations/library/convert_camelCase.py index 50ca34c3649..0bc267cb68d 100644 --- a/test/integration/targets/dict_transformations/library/convert_camelCase.py +++ b/test/integration/targets/dict_transformations/library/convert_camelCase.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/dict_transformations/library/convert_snake_case.py b/test/integration/targets/dict_transformations/library/convert_snake_case.py index 4c13fbcbc12..b645eb7aa7e 100644 --- a/test/integration/targets/dict_transformations/library/convert_snake_case.py +++ b/test/integration/targets/dict_transformations/library/convert_snake_case.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/egg-info/lookup_plugins/import_pkg_resources.py b/test/integration/targets/egg-info/lookup_plugins/import_pkg_resources.py index 28227fcef89..cba386b83c6 100644 --- a/test/integration/targets/egg-info/lookup_plugins/import_pkg_resources.py +++ b/test/integration/targets/egg-info/lookup_plugins/import_pkg_resources.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pkg_resources # pylint: disable=unused-import diff --git a/test/integration/targets/error_from_connection/connection_plugins/dummy.py b/test/integration/targets/error_from_connection/connection_plugins/dummy.py index d322fe0d0ca..8450b7bb202 100644 --- a/test/integration/targets/error_from_connection/connection_plugins/dummy.py +++ b/test/integration/targets/error_from_connection/connection_plugins/dummy.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ author: diff --git a/test/integration/targets/expect/files/test_command.py b/test/integration/targets/expect/files/test_command.py index 0e0e2646669..c723e7c9da6 100644 --- a/test/integration/targets/expect/files/test_command.py +++ b/test/integration/targets/expect/files/test_command.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/integration/targets/fetch/injection/library/slurp.py b/test/integration/targets/fetch/injection/library/slurp.py index 7b78ba18056..1fcd5c25043 100644 --- a/test/integration/targets/fetch/injection/library/slurp.py +++ b/test/integration/targets/fetch/injection/library/slurp.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ diff --git a/test/integration/targets/fork_safe_stdio/callback_plugins/spewstdio.py b/test/integration/targets/fork_safe_stdio/callback_plugins/spewstdio.py index 6ed6ef34a1a..dba00a9d6e2 100644 --- a/test/integration/targets/fork_safe_stdio/callback_plugins/spewstdio.py +++ b/test/integration/targets/fork_safe_stdio/callback_plugins/spewstdio.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import atexit import os import sys diff --git a/test/integration/targets/fork_safe_stdio/run-with-pty.py b/test/integration/targets/fork_safe_stdio/run-with-pty.py index 463915284b2..b4ccb7b6513 100755 --- a/test/integration/targets/fork_safe_stdio/run-with-pty.py +++ b/test/integration/targets/fork_safe_stdio/run-with-pty.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Run a command using a PTY.""" +from __future__ import annotations import sys diff --git a/test/integration/targets/fork_safe_stdio/vendored_pty.py b/test/integration/targets/fork_safe_stdio/vendored_pty.py index bc70803b8d7..346bae3de9e 100644 --- a/test/integration/targets/fork_safe_stdio/vendored_pty.py +++ b/test/integration/targets/fork_safe_stdio/vendored_pty.py @@ -7,6 +7,7 @@ # See: W. Richard Stevens. 1992. Advanced Programming in the # UNIX Environment. Chapter 19. # Author: Steen Lumholt -- with additions by Guido. +from __future__ import annotations from select import select import os diff --git a/test/integration/targets/gathering_facts/cache_plugins/none.py b/test/integration/targets/gathering_facts/cache_plugins/none.py index 5681dee0e49..715f7aec235 100644 --- a/test/integration/targets/gathering_facts/cache_plugins/none.py +++ b/test/integration/targets/gathering_facts/cache_plugins/none.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.cache import BaseCacheModule diff --git a/test/integration/targets/gathering_facts/collections/ansible_collections/cisco/ios/plugins/modules/ios_facts.py b/test/integration/targets/gathering_facts/collections/ansible_collections/cisco/ios/plugins/modules/ios_facts.py index b79f794100e..89741812beb 100644 --- a/test/integration/targets/gathering_facts/collections/ansible_collections/cisco/ios/plugins/modules/ios_facts.py +++ b/test/integration/targets/gathering_facts/collections/ansible_collections/cisco/ios/plugins/modules/ios_facts.py @@ -1,4 +1,5 @@ #!/usr/bin/python +from __future__ import annotations DOCUMENTATION = """ --- diff --git a/test/integration/targets/gathering_facts/library/file_utils.py b/test/integration/targets/gathering_facts/library/file_utils.py index 38fa926524a..29da29bc194 100644 --- a/test/integration/targets/gathering_facts/library/file_utils.py +++ b/test/integration/targets/gathering_facts/library/file_utils.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.facts.utils import ( diff --git a/test/integration/targets/get_url/files/testserver.py b/test/integration/targets/get_url/files/testserver.py index 24967d4f0d8..308426441fe 100644 --- a/test/integration/targets/get_url/files/testserver.py +++ b/test/integration/targets/get_url/files/testserver.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/integration/targets/group/files/get_free_gid.py b/test/integration/targets/group/files/get_free_gid.py index 4c07b5e3bc4..155254dd92e 100644 --- a/test/integration/targets/group/files/get_free_gid.py +++ b/test/integration/targets/group/files/get_free_gid.py @@ -1,6 +1,5 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import grp diff --git a/test/integration/targets/group/files/get_gid_for_group.py b/test/integration/targets/group/files/get_gid_for_group.py index 5a8cc41f31f..ce3573900f6 100644 --- a/test/integration/targets/group/files/get_gid_for_group.py +++ b/test/integration/targets/group/files/get_gid_for_group.py @@ -1,6 +1,5 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import grp import sys diff --git a/test/integration/targets/ignore_unreachable/fake_connectors/bad_exec.py b/test/integration/targets/ignore_unreachable/fake_connectors/bad_exec.py index 0d8c385b179..0f350db5a34 100644 --- a/test/integration/targets/ignore_unreachable/fake_connectors/bad_exec.py +++ b/test/integration/targets/ignore_unreachable/fake_connectors/bad_exec.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.plugins.connection.local as ansible_local from ansible.errors import AnsibleConnectionFailure diff --git a/test/integration/targets/ignore_unreachable/fake_connectors/bad_put_file.py b/test/integration/targets/ignore_unreachable/fake_connectors/bad_put_file.py index d4131f45e01..99a1c1b0b0b 100644 --- a/test/integration/targets/ignore_unreachable/fake_connectors/bad_put_file.py +++ b/test/integration/targets/ignore_unreachable/fake_connectors/bad_put_file.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import ansible.plugins.connection.local as ansible_local from ansible.errors import AnsibleConnectionFailure diff --git a/test/integration/targets/include_import/playbook/sub_playbook/library/helloworld.py b/test/integration/targets/include_import/playbook/sub_playbook/library/helloworld.py index 0ebe690ddf5..7fc1da966fe 100644 --- a/test/integration/targets/include_import/playbook/sub_playbook/library/helloworld.py +++ b/test/integration/targets/include_import/playbook/sub_playbook/library/helloworld.py @@ -14,8 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/infra/library/test.py b/test/integration/targets/infra/library/test.py index dbc4b610855..ad8929b4b4f 100644 --- a/test/integration/targets/infra/library/test.py +++ b/test/integration/targets/infra/library/test.py @@ -1,8 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/interpreter_discovery_python/library/test_echo_module.py b/test/integration/targets/interpreter_discovery_python/library/test_echo_module.py index 73179211f75..b394f9d9b68 100644 --- a/test/integration/targets/interpreter_discovery_python/library/test_echo_module.py +++ b/test/integration/targets/interpreter_discovery_python/library/test_echo_module.py @@ -5,8 +5,7 @@ # (c) 2016, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import sys from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/inventory/inventory_plugins/contructed_with_hostvars.py b/test/integration/targets/inventory/inventory_plugins/contructed_with_hostvars.py index 43cad4fcf12..8e179eb44cb 100644 --- a/test/integration/targets/inventory/inventory_plugins/contructed_with_hostvars.py +++ b/test/integration/targets/inventory/inventory_plugins/contructed_with_hostvars.py @@ -1,8 +1,7 @@ # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: constructed_with_hostvars diff --git a/test/integration/targets/inventory_cache/plugins/inventory/cache_host.py b/test/integration/targets/inventory_cache/plugins/inventory/cache_host.py index 628aba158e0..6c93f03d458 100644 --- a/test/integration/targets/inventory_cache/plugins/inventory/cache_host.py +++ b/test/integration/targets/inventory_cache/plugins/inventory/cache_host.py @@ -1,8 +1,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' inventory: cache_host diff --git a/test/integration/targets/inventory_cache/plugins/inventory/exercise_cache.py b/test/integration/targets/inventory_cache/plugins/inventory/exercise_cache.py index cca2aa0fd9f..04afd0e9536 100644 --- a/test/integration/targets/inventory_cache/plugins/inventory/exercise_cache.py +++ b/test/integration/targets/inventory_cache/plugins/inventory/exercise_cache.py @@ -1,8 +1,7 @@ # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' inventory: exercise_cache diff --git a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/bad_collection_filter.py b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/bad_collection_filter.py index 366695321a0..26af84b56c0 100644 --- a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/bad_collection_filter.py +++ b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/bad_collection_filter.py @@ -1,9 +1,7 @@ # Copyright (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class FilterModule: diff --git a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/bad_collection_filter2.py b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/bad_collection_filter2.py index 96e726ac481..e039c8c9614 100644 --- a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/bad_collection_filter2.py +++ b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/bad_collection_filter2.py @@ -1,9 +1,7 @@ # Copyright (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class FilterModule: diff --git a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/good_collection_filter.py b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/good_collection_filter.py index e2e7ffcd5ce..e43c984e616 100644 --- a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/good_collection_filter.py +++ b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/filter/good_collection_filter.py @@ -1,9 +1,7 @@ # Copyright (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class FilterModule: diff --git a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/test/bad_collection_test.py b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/test/bad_collection_test.py index 9fce558107e..3c854ba7c9b 100644 --- a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/test/bad_collection_test.py +++ b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/test/bad_collection_test.py @@ -1,9 +1,7 @@ # Copyright (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class TestModule: diff --git a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/test/good_collection_test.py b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/test/good_collection_test.py index a4ca2ff2f7c..d13daca6dcf 100644 --- a/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/test/good_collection_test.py +++ b/test/integration/targets/jinja_plugins/collections/ansible_collections/foo/bar/plugins/test/good_collection_test.py @@ -1,9 +1,7 @@ # Copyright (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class TestModule: diff --git a/test/integration/targets/jinja_plugins/filter_plugins/bad_filter.py b/test/integration/targets/jinja_plugins/filter_plugins/bad_filter.py index eebf39c9a47..5dd653fc274 100644 --- a/test/integration/targets/jinja_plugins/filter_plugins/bad_filter.py +++ b/test/integration/targets/jinja_plugins/filter_plugins/bad_filter.py @@ -1,9 +1,7 @@ # Copyright (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class FilterModule: diff --git a/test/integration/targets/jinja_plugins/filter_plugins/good_filter.py b/test/integration/targets/jinja_plugins/filter_plugins/good_filter.py index e2e7ffcd5ce..e43c984e616 100644 --- a/test/integration/targets/jinja_plugins/filter_plugins/good_filter.py +++ b/test/integration/targets/jinja_plugins/filter_plugins/good_filter.py @@ -1,9 +1,7 @@ # Copyright (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class FilterModule: diff --git a/test/integration/targets/jinja_plugins/test_plugins/bad_test.py b/test/integration/targets/jinja_plugins/test_plugins/bad_test.py index 0cc7a5a8857..251d5ef075d 100644 --- a/test/integration/targets/jinja_plugins/test_plugins/bad_test.py +++ b/test/integration/targets/jinja_plugins/test_plugins/bad_test.py @@ -1,9 +1,7 @@ # Copyright (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class TestModule: diff --git a/test/integration/targets/jinja_plugins/test_plugins/good_test.py b/test/integration/targets/jinja_plugins/test_plugins/good_test.py index a4ca2ff2f7c..d13daca6dcf 100644 --- a/test/integration/targets/jinja_plugins/test_plugins/good_test.py +++ b/test/integration/targets/jinja_plugins/test_plugins/good_test.py @@ -1,9 +1,7 @@ # Copyright (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class TestModule: diff --git a/test/integration/targets/loop-connection/collections/ansible_collections/ns/name/plugins/connection/dummy.py b/test/integration/targets/loop-connection/collections/ansible_collections/ns/name/plugins/connection/dummy.py index cb14991fc30..ca2ac250c7f 100644 --- a/test/integration/targets/loop-connection/collections/ansible_collections/ns/name/plugins/connection/dummy.py +++ b/test/integration/targets/loop-connection/collections/ansible_collections/ns/name/plugins/connection/dummy.py @@ -1,4 +1,5 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations DOCUMENTATION = ''' name: dummy diff --git a/test/integration/targets/missing_required_lib/library/missing_required_lib.py b/test/integration/targets/missing_required_lib/library/missing_required_lib.py index 8c7ba884350..a5ba7c5421a 100644 --- a/test/integration/targets/missing_required_lib/library/missing_required_lib.py +++ b/test/integration/targets/missing_required_lib/library/missing_required_lib.py @@ -2,8 +2,7 @@ # Copyright: (c) 2020, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule, missing_required_lib diff --git a/test/integration/targets/module_defaults/action_plugins/debug.py b/test/integration/targets/module_defaults/action_plugins/debug.py index 0c43201c750..63c0779b131 100644 --- a/test/integration/targets/module_defaults/action_plugins/debug.py +++ b/test/integration/targets/module_defaults/action_plugins/debug.py @@ -15,8 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleUndefinedVariable from ansible.module_utils.six import string_types diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/othercoll/plugins/action/other_echoaction.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/othercoll/plugins/action/other_echoaction.py index f7777b8ae2b..dcbe089bcab 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/othercoll/plugins/action/other_echoaction.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/othercoll/plugins/action/other_echoaction.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible_collections.testns.testcoll.plugins.action.echoaction import ActionModule as BaseAM diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/othercoll/plugins/modules/other_echo1.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/othercoll/plugins/modules/other_echo1.py index 771395f2328..6ca7b63df35 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/othercoll/plugins/modules/other_echo1.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/othercoll/plugins/modules/other_echo1.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible_collections.testns.testcoll.plugins.module_utils.echo_impl import do_echo diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/echoaction.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/echoaction.py index 2fa097b29f1..88ec765e872 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/echoaction.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/echoaction.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/eos.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/eos.py index 174f3725f2c..627cbddcfd8 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/eos.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/eos.py @@ -1,8 +1,7 @@ # Copyright: (c) 2022, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action.normal import ActionModule as ActionBase diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/ios.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/ios.py index 7ba243482f5..16478161d48 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/ios.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/ios.py @@ -1,8 +1,7 @@ # Copyright: (c) 2022, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action.normal import ActionModule as ActionBase diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/vyos.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/vyos.py index 67050fbda06..34732aa0f72 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/vyos.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/action/vyos.py @@ -1,8 +1,7 @@ # Copyright: (c) 2022, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action.normal import ActionModule as ActionBase diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/module_utils/echo_impl.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/module_utils/echo_impl.py index f5c5d737be7..2a880e20840 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/module_utils/echo_impl.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/module_utils/echo_impl.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json from ansible.module_utils import basic diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/echo1.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/echo1.py index 771395f2328..6ca7b63df35 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/echo1.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/echo1.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible_collections.testns.testcoll.plugins.module_utils.echo_impl import do_echo diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/echo2.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/echo2.py index 771395f2328..6ca7b63df35 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/echo2.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/echo2.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible_collections.testns.testcoll.plugins.module_utils.echo_impl import do_echo diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/eosfacts.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/eosfacts.py index 8c73fe15a18..546205b1c9b 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/eosfacts.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/eosfacts.py @@ -3,8 +3,7 @@ # Copyright: (c) 2022, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/ios_facts.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/ios_facts.py index e2ed598164d..2e230ec5333 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/ios_facts.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/ios_facts.py @@ -3,8 +3,7 @@ # Copyright: (c) 2022, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/metadata.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/metadata.py index 6a818fd8a22..439b415578f 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/metadata.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/metadata.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/module.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/module.py index b98a5f9426c..f7a1932d7c1 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/module.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/module.py @@ -3,8 +3,7 @@ # Copyright: (c) 2022, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/ping.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/ping.py index 2cb1fb231f2..b54b701d577 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/ping.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/ping.py @@ -5,8 +5,7 @@ # (c) 2016, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/vyosfacts.py b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/vyosfacts.py index 3a9abbc66c2..7af1c6bdc0f 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/vyosfacts.py +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/plugins/modules/vyosfacts.py @@ -3,8 +3,7 @@ # Copyright: (c) 2022, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' diff --git a/test/integration/targets/module_defaults/library/legacy_ping.py b/test/integration/targets/module_defaults/library/legacy_ping.py index 2cb1fb231f2..b54b701d577 100644 --- a/test/integration/targets/module_defaults/library/legacy_ping.py +++ b/test/integration/targets/module_defaults/library/legacy_ping.py @@ -5,8 +5,7 @@ # (c) 2016, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' diff --git a/test/integration/targets/module_defaults/library/test_module_defaults.py b/test/integration/targets/module_defaults/library/test_module_defaults.py index ede8c995607..3d7718d1ac1 100644 --- a/test/integration/targets/module_defaults/library/test_module_defaults.py +++ b/test/integration/targets/module_defaults/library/test_module_defaults.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/module_no_log/library/module_that_logs.py b/test/integration/targets/module_no_log/library/module_that_logs.py index 44b36eeb808..cb517f7bdfc 100644 --- a/test/integration/targets/module_no_log/library/module_that_logs.py +++ b/test/integration/targets/module_no_log/library/module_that_logs.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/module_precedence/lib_with_extension/a.py b/test/integration/targets/module_precedence/lib_with_extension/a.py index 8eda1419313..dc537f0a9d3 100644 --- a/test/integration/targets/module_precedence/lib_with_extension/a.py +++ b/test/integration/targets/module_precedence/lib_with_extension/a.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/module_precedence/lib_with_extension/ping.py b/test/integration/targets/module_precedence/lib_with_extension/ping.py index a28f4699ee7..ab4a9893d69 100644 --- a/test/integration/targets/module_precedence/lib_with_extension/ping.py +++ b/test/integration/targets/module_precedence/lib_with_extension/ping.py @@ -19,8 +19,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], diff --git a/test/integration/targets/module_precedence/multiple_roles/bar/library/ping.py b/test/integration/targets/module_precedence/multiple_roles/bar/library/ping.py index 98ef7b448c0..88fc595d276 100644 --- a/test/integration/targets/module_precedence/multiple_roles/bar/library/ping.py +++ b/test/integration/targets/module_precedence/multiple_roles/bar/library/ping.py @@ -19,8 +19,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], diff --git a/test/integration/targets/module_precedence/multiple_roles/foo/library/ping.py b/test/integration/targets/module_precedence/multiple_roles/foo/library/ping.py index 8860b7aa658..72c3cb8bc0d 100644 --- a/test/integration/targets/module_precedence/multiple_roles/foo/library/ping.py +++ b/test/integration/targets/module_precedence/multiple_roles/foo/library/ping.py @@ -19,8 +19,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], diff --git a/test/integration/targets/module_precedence/roles_with_extension/foo/library/a.py b/test/integration/targets/module_precedence/roles_with_extension/foo/library/a.py index 4bc5906d9b5..cc66035989f 100644 --- a/test/integration/targets/module_precedence/roles_with_extension/foo/library/a.py +++ b/test/integration/targets/module_precedence/roles_with_extension/foo/library/a.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/module_precedence/roles_with_extension/foo/library/ping.py b/test/integration/targets/module_precedence/roles_with_extension/foo/library/ping.py index 8860b7aa658..72c3cb8bc0d 100644 --- a/test/integration/targets/module_precedence/roles_with_extension/foo/library/ping.py +++ b/test/integration/targets/module_precedence/roles_with_extension/foo/library/ping.py @@ -19,8 +19,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['stableinterface'], diff --git a/test/integration/targets/module_utils/callback/pure_json.py b/test/integration/targets/module_utils/callback/pure_json.py index 1723d7bbe86..7a9b8006883 100644 --- a/test/integration/targets/module_utils/callback/pure_json.py +++ b/test/integration/targets/module_utils/callback/pure_json.py @@ -1,8 +1,7 @@ # (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: pure_json diff --git a/test/integration/targets/module_utils/collections/ansible_collections/testns/testcoll/plugins/module_utils/legit.py b/test/integration/targets/module_utils/collections/ansible_collections/testns/testcoll/plugins/module_utils/legit.py index b9d63482a10..e12624dbef7 100644 --- a/test/integration/targets/module_utils/collections/ansible_collections/testns/testcoll/plugins/module_utils/legit.py +++ b/test/integration/targets/module_utils/collections/ansible_collections/testns/testcoll/plugins/module_utils/legit.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations def importme(): diff --git a/test/integration/targets/module_utils/library/test.py b/test/integration/targets/module_utils/library/test.py index 857d3d8e34b..71f92922ac6 100644 --- a/test/integration/targets/module_utils/library/test.py +++ b/test/integration/targets/module_utils/library/test.py @@ -2,7 +2,7 @@ # Most of these names are only available via PluginLoader so pylint doesn't # know they exist # pylint: disable=no-name-in-module -__metaclass__ = type +from __future__ import annotations results = {} diff --git a/test/integration/targets/module_utils/library/test_alias_deprecation.py b/test/integration/targets/module_utils/library/test_alias_deprecation.py index dc36abae710..7d7cfa3d8d3 100644 --- a/test/integration/targets/module_utils/library/test_alias_deprecation.py +++ b/test/integration/targets/module_utils/library/test_alias_deprecation.py @@ -1,7 +1,6 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule # overridden diff --git a/test/integration/targets/module_utils/library/test_cwd_missing.py b/test/integration/targets/module_utils/library/test_cwd_missing.py index cd1f9c77266..489b0cc4865 100644 --- a/test/integration/targets/module_utils/library/test_cwd_missing.py +++ b/test/integration/targets/module_utils/library/test_cwd_missing.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/integration/targets/module_utils/library/test_cwd_unreadable.py b/test/integration/targets/module_utils/library/test_cwd_unreadable.py index d65f31ac30d..9f973e54462 100644 --- a/test/integration/targets/module_utils/library/test_cwd_unreadable.py +++ b/test/integration/targets/module_utils/library/test_cwd_unreadable.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/integration/targets/module_utils/library/test_datetime.py b/test/integration/targets/module_utils/library/test_datetime.py index 493a186ac3c..39eba252043 100644 --- a/test/integration/targets/module_utils/library/test_datetime.py +++ b/test/integration/targets/module_utils/library/test_datetime.py @@ -2,8 +2,7 @@ # Most of these names are only available via PluginLoader so pylint doesn't # know they exist # pylint: disable=no-name-in-module -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule import datetime diff --git a/test/integration/targets/module_utils/library/test_env_override.py b/test/integration/targets/module_utils/library/test_env_override.py index ebfb5ddff06..041559b6dc0 100644 --- a/test/integration/targets/module_utils/library/test_env_override.py +++ b/test/integration/targets/module_utils/library/test_env_override.py @@ -2,8 +2,7 @@ # Most of these names are only available via PluginLoader so pylint doesn't # know they exist # pylint: disable=no-name-in-module -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.json_utils import data diff --git a/test/integration/targets/module_utils/library/test_failure.py b/test/integration/targets/module_utils/library/test_failure.py index ab80ceaeacf..ff8b477e487 100644 --- a/test/integration/targets/module_utils/library/test_failure.py +++ b/test/integration/targets/module_utils/library/test_failure.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations results = {} # Test that we are rooted correctly diff --git a/test/integration/targets/module_utils/library/test_heuristic_log_sanitize.py b/test/integration/targets/module_utils/library/test_heuristic_log_sanitize.py index 2e8782c58e1..a30a622875e 100644 --- a/test/integration/targets/module_utils/library/test_heuristic_log_sanitize.py +++ b/test/integration/targets/module_utils/library/test_heuristic_log_sanitize.py @@ -1,7 +1,6 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils import basic from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/module_utils/library/test_network.py b/test/integration/targets/module_utils/library/test_network.py index c6a5390292b..c1abd946561 100644 --- a/test/integration/targets/module_utils/library/test_network.py +++ b/test/integration/targets/module_utils/library/test_network.py @@ -3,8 +3,7 @@ # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.network import to_subnet diff --git a/test/integration/targets/module_utils/library/test_no_log.py b/test/integration/targets/module_utils/library/test_no_log.py index 770e0b3a17e..6a8cd58b90f 100644 --- a/test/integration/targets/module_utils/library/test_no_log.py +++ b/test/integration/targets/module_utils/library/test_no_log.py @@ -2,8 +2,7 @@ # (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule, env_fallback diff --git a/test/integration/targets/module_utils/library/test_optional.py b/test/integration/targets/module_utils/library/test_optional.py index 4d0225d96ff..019b25bf794 100644 --- a/test/integration/targets/module_utils/library/test_optional.py +++ b/test/integration/targets/module_utils/library/test_optional.py @@ -2,8 +2,7 @@ # Most of these names are only available via PluginLoader so pylint doesn't # know they exist # pylint: disable=no-name-in-module -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/module_utils/library/test_override.py b/test/integration/targets/module_utils/library/test_override.py index 7f6e7a5f555..4eef499de26 100644 --- a/test/integration/targets/module_utils/library/test_override.py +++ b/test/integration/targets/module_utils/library/test_override.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule # overridden diff --git a/test/integration/targets/module_utils/library/test_recursive_diff.py b/test/integration/targets/module_utils/library/test_recursive_diff.py index 0cf39d9c32e..bb618acf115 100644 --- a/test/integration/targets/module_utils/library/test_recursive_diff.py +++ b/test/integration/targets/module_utils/library/test_recursive_diff.py @@ -2,8 +2,7 @@ # Copyright: (c) 2020, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.dict_transformations import recursive_diff diff --git a/test/integration/targets/module_utils_ansible_release/library/ansible_release.py b/test/integration/targets/module_utils_ansible_release/library/ansible_release.py index 528465da525..8e15b856d4f 100644 --- a/test/integration/targets/module_utils_ansible_release/library/ansible_release.py +++ b/test/integration/targets/module_utils_ansible_release/library/ansible_release.py @@ -2,8 +2,7 @@ # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' --- diff --git a/test/integration/targets/module_utils_common.respawn/library/respawnme.py b/test/integration/targets/module_utils_common.respawn/library/respawnme.py index 6471dba49be..1dd17398e71 100644 --- a/test/integration/targets/module_utils_common.respawn/library/respawnme.py +++ b/test/integration/targets/module_utils_common.respawn/library/respawnme.py @@ -3,8 +3,7 @@ # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import sys diff --git a/test/integration/targets/module_utils_urls/library/test_peercert.py b/test/integration/targets/module_utils_urls/library/test_peercert.py index ecb7d2046f3..7bac2222888 100644 --- a/test/integration/targets/module_utils_urls/library/test_peercert.py +++ b/test/integration/targets/module_utils_urls/library/test_peercert.py @@ -2,8 +2,7 @@ # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' --- diff --git a/test/integration/targets/no_log/library/module.py b/test/integration/targets/no_log/library/module.py index d4f3c565cff..61c2908e128 100644 --- a/test/integration/targets/no_log/library/module.py +++ b/test/integration/targets/no_log/library/module.py @@ -3,8 +3,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/old_style_cache_plugins/plugins/cache/configurable_redis.py b/test/integration/targets/old_style_cache_plugins/plugins/cache/configurable_redis.py index 23c7789b84a..805cdbafe8d 100644 --- a/test/integration/targets/old_style_cache_plugins/plugins/cache/configurable_redis.py +++ b/test/integration/targets/old_style_cache_plugins/plugins/cache/configurable_redis.py @@ -1,8 +1,7 @@ # (c) 2014, Brian Coca, Josh Drake, et al # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' cache: configurable_redis diff --git a/test/integration/targets/old_style_cache_plugins/plugins/cache/legacy_redis.py b/test/integration/targets/old_style_cache_plugins/plugins/cache/legacy_redis.py index 9879dec9b19..98bd188c246 100644 --- a/test/integration/targets/old_style_cache_plugins/plugins/cache/legacy_redis.py +++ b/test/integration/targets/old_style_cache_plugins/plugins/cache/legacy_redis.py @@ -1,8 +1,7 @@ # (c) 2014, Brian Coca, Josh Drake, et al # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' cache: redis diff --git a/test/integration/targets/old_style_cache_plugins/plugins/inventory/test.py b/test/integration/targets/old_style_cache_plugins/plugins/inventory/test.py index 7e591957fd7..6dd450f2dd5 100644 --- a/test/integration/targets/old_style_cache_plugins/plugins/inventory/test.py +++ b/test/integration/targets/old_style_cache_plugins/plugins/inventory/test.py @@ -1,8 +1,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' name: test diff --git a/test/integration/targets/old_style_vars_plugins/deprecation_warning/v2_vars_plugin.py b/test/integration/targets/old_style_vars_plugins/deprecation_warning/v2_vars_plugin.py index f342b698a01..723e0a40cd1 100644 --- a/test/integration/targets/old_style_vars_plugins/deprecation_warning/v2_vars_plugin.py +++ b/test/integration/targets/old_style_vars_plugins/deprecation_warning/v2_vars_plugin.py @@ -1,3 +1,6 @@ +from __future__ import annotations + + class VarsModule: def get_host_vars(self, entity): return {} diff --git a/test/integration/targets/old_style_vars_plugins/deprecation_warning/vars.py b/test/integration/targets/old_style_vars_plugins/deprecation_warning/vars.py index f554be04fbd..22fb451e29d 100644 --- a/test/integration/targets/old_style_vars_plugins/deprecation_warning/vars.py +++ b/test/integration/targets/old_style_vars_plugins/deprecation_warning/vars.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from ansible.plugins.vars import BaseVarsPlugin diff --git a/test/integration/targets/old_style_vars_plugins/vars_plugins/auto_enabled.py b/test/integration/targets/old_style_vars_plugins/vars_plugins/auto_enabled.py index a91d94d1ddb..c933f56c7ef 100644 --- a/test/integration/targets/old_style_vars_plugins/vars_plugins/auto_enabled.py +++ b/test/integration/targets/old_style_vars_plugins/vars_plugins/auto_enabled.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from ansible.plugins.vars import BaseVarsPlugin diff --git a/test/integration/targets/old_style_vars_plugins/vars_plugins/implicitly_auto_enabled.py b/test/integration/targets/old_style_vars_plugins/vars_plugins/implicitly_auto_enabled.py index 4f407b47177..5dff8ad662d 100644 --- a/test/integration/targets/old_style_vars_plugins/vars_plugins/implicitly_auto_enabled.py +++ b/test/integration/targets/old_style_vars_plugins/vars_plugins/implicitly_auto_enabled.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from ansible.plugins.vars import BaseVarsPlugin diff --git a/test/integration/targets/old_style_vars_plugins/vars_plugins/require_enabled.py b/test/integration/targets/old_style_vars_plugins/vars_plugins/require_enabled.py index a251447f0a5..302b6cc3d4d 100644 --- a/test/integration/targets/old_style_vars_plugins/vars_plugins/require_enabled.py +++ b/test/integration/targets/old_style_vars_plugins/vars_plugins/require_enabled.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from ansible.plugins.vars import BaseVarsPlugin diff --git a/test/integration/targets/packaging_cli-doc/verify.py b/test/integration/targets/packaging_cli-doc/verify.py index 7793fa8c24b..7fe9d1d371d 100755 --- a/test/integration/targets/packaging_cli-doc/verify.py +++ b/test/integration/targets/packaging_cli-doc/verify.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import annotations import os import pathlib diff --git a/test/integration/targets/pause/test-pause.py b/test/integration/targets/pause/test-pause.py index ab771fa09e4..1aebfbbb420 100755 --- a/test/integration/targets/pause/test-pause.py +++ b/test/integration/targets/pause/test-pause.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import pexpect diff --git a/test/integration/targets/pip/files/ansible_test_pip_chdir/__init__.py b/test/integration/targets/pip/files/ansible_test_pip_chdir/__init__.py index 5d1f9aec746..a039849a7e7 100644 --- a/test/integration/targets/pip/files/ansible_test_pip_chdir/__init__.py +++ b/test/integration/targets/pip/files/ansible_test_pip_chdir/__init__.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def main(): diff --git a/test/integration/targets/pip/files/setup.py b/test/integration/targets/pip/files/setup.py index aaf21875ca2..7d7240fe4e0 100755 --- a/test/integration/targets/pip/files/setup.py +++ b/test/integration/targets/pip/files/setup.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from setuptools import setup, find_packages diff --git a/test/integration/targets/pkg_resources/lookup_plugins/check_pkg_resources.py b/test/integration/targets/pkg_resources/lookup_plugins/check_pkg_resources.py index 44412f22821..8f0b4b27afa 100644 --- a/test/integration/targets/pkg_resources/lookup_plugins/check_pkg_resources.py +++ b/test/integration/targets/pkg_resources/lookup_plugins/check_pkg_resources.py @@ -6,8 +6,7 @@ If pkg_resources is installed but is unable to function, this test will fail. One known failure case this test can detect is when ansible declares a __requires__ and then tests are run without an egg-info directory. """ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations # noinspection PyUnresolvedReferences try: diff --git a/test/integration/targets/plugin_config_for_inventory/cache_plugins/none.py b/test/integration/targets/plugin_config_for_inventory/cache_plugins/none.py index 62a91c850d3..771b418c923 100644 --- a/test/integration/targets/plugin_config_for_inventory/cache_plugins/none.py +++ b/test/integration/targets/plugin_config_for_inventory/cache_plugins/none.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.cache import BaseCacheModule diff --git a/test/integration/targets/plugin_config_for_inventory/test_inventory.py b/test/integration/targets/plugin_config_for_inventory/test_inventory.py index f937c03806c..ad39efc3350 100644 --- a/test/integration/targets/plugin_config_for_inventory/test_inventory.py +++ b/test/integration/targets/plugin_config_for_inventory/test_inventory.py @@ -1,6 +1,5 @@ -from __future__ import (absolute_import, division, print_function) +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = ''' name: test_inventory diff --git a/test/integration/targets/plugin_loader/normal/action_plugins/self_referential.py b/test/integration/targets/plugin_loader/normal/action_plugins/self_referential.py index b4c89577597..33905f89296 100644 --- a/test/integration/targets/plugin_loader/normal/action_plugins/self_referential.py +++ b/test/integration/targets/plugin_loader/normal/action_plugins/self_referential.py @@ -1,7 +1,6 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/plugin_loader/normal/library/_underscore.py b/test/integration/targets/plugin_loader/normal/library/_underscore.py index 7a416a64879..d77057791f0 100644 --- a/test/integration/targets/plugin_loader/normal/library/_underscore.py +++ b/test/integration/targets/plugin_loader/normal/library/_underscore.py @@ -1,6 +1,5 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/integration/targets/plugin_loader/override/filter_plugins/core.py b/test/integration/targets/plugin_loader/override/filter_plugins/core.py index f283dc398b0..89246377cb2 100644 --- a/test/integration/targets/plugin_loader/override/filter_plugins/core.py +++ b/test/integration/targets/plugin_loader/override/filter_plugins/core.py @@ -1,6 +1,4 @@ -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def do_flag(myval): diff --git a/test/integration/targets/plugin_namespace/filter_plugins/test_filter.py b/test/integration/targets/plugin_namespace/filter_plugins/test_filter.py index dca094be8a4..aea1bba7a14 100644 --- a/test/integration/targets/plugin_namespace/filter_plugins/test_filter.py +++ b/test/integration/targets/plugin_namespace/filter_plugins/test_filter.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def filter_name(a): diff --git a/test/integration/targets/plugin_namespace/lookup_plugins/lookup_name.py b/test/integration/targets/plugin_namespace/lookup_plugins/lookup_name.py index d0af703bbdc..4a8d0422a47 100644 --- a/test/integration/targets/plugin_namespace/lookup_plugins/lookup_name.py +++ b/test/integration/targets/plugin_namespace/lookup_plugins/lookup_name.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.lookup import LookupBase diff --git a/test/integration/targets/plugin_namespace/test_plugins/test_test.py b/test/integration/targets/plugin_namespace/test_plugins/test_test.py index 2a9d6ee0793..fd949e49ca8 100644 --- a/test/integration/targets/plugin_namespace/test_plugins/test_test.py +++ b/test/integration/targets/plugin_namespace/test_plugins/test_test.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/test/integration/targets/prepare_http_tests/library/httptester_kinit.py b/test/integration/targets/prepare_http_tests/library/httptester_kinit.py index 4f7b7ad4db3..a84e3fb4430 100644 --- a/test/integration/targets/prepare_http_tests/library/httptester_kinit.py +++ b/test/integration/targets/prepare_http_tests/library/httptester_kinit.py @@ -2,8 +2,7 @@ # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r''' --- diff --git a/test/integration/targets/rel_plugin_loading/subdir/inventory_plugins/notyaml.py b/test/integration/targets/rel_plugin_loading/subdir/inventory_plugins/notyaml.py index 41a76d9b135..32b48299909 100644 --- a/test/integration/targets/rel_plugin_loading/subdir/inventory_plugins/notyaml.py +++ b/test/integration/targets/rel_plugin_loading/subdir/inventory_plugins/notyaml.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' inventory: yaml diff --git a/test/integration/targets/result_pickle_error/action_plugins/result_pickle_error.py b/test/integration/targets/result_pickle_error/action_plugins/result_pickle_error.py index e8d712a337b..c55cfc38a4d 100644 --- a/test/integration/targets/result_pickle_error/action_plugins/result_pickle_error.py +++ b/test/integration/targets/result_pickle_error/action_plugins/result_pickle_error.py @@ -2,8 +2,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase from jinja2 import Undefined diff --git a/test/integration/targets/run_modules/library/test.py b/test/integration/targets/run_modules/library/test.py index 15a92e9128f..fed83ec2c77 100644 --- a/test/integration/targets/run_modules/library/test.py +++ b/test/integration/targets/run_modules/library/test.py @@ -1,7 +1,6 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/script/files/no_shebang.py b/test/integration/targets/script/files/no_shebang.py index f2d386a0b25..7a2e3e6acb6 100644 --- a/test/integration/targets/script/files/no_shebang.py +++ b/test/integration/targets/script/files/no_shebang.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/integration/targets/service/files/ansible_test_service.py b/test/integration/targets/service/files/ansible_test_service.py index 6292272e631..6bf404cad40 100644 --- a/test/integration/targets/service/files/ansible_test_service.py +++ b/test/integration/targets/service/files/ansible_test_service.py @@ -3,8 +3,7 @@ # this is mostly based off of the code found here: # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import resource diff --git a/test/integration/targets/service_facts/files/ansible_test_service.py b/test/integration/targets/service_facts/files/ansible_test_service.py index 19f1e291388..6bf404cad40 100644 --- a/test/integration/targets/service_facts/files/ansible_test_service.py +++ b/test/integration/targets/service_facts/files/ansible_test_service.py @@ -3,8 +3,7 @@ # this is mostly based off of the code found here: # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os import resource diff --git a/test/integration/targets/setup_paramiko/library/detect_paramiko.py b/test/integration/targets/setup_paramiko/library/detect_paramiko.py index e3a815827ce..15905b820fa 100644 --- a/test/integration/targets/setup_paramiko/library/detect_paramiko.py +++ b/test/integration/targets/setup_paramiko/library/detect_paramiko.py @@ -1,9 +1,8 @@ #!/usr/bin/python """Ansible module to detect the presence of both the normal and Ansible-specific versions of Paramiko.""" -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type from ansible.module_utils.basic import AnsibleModule diff --git a/test/integration/targets/setup_rpm_repo/library/create_repo.py b/test/integration/targets/setup_rpm_repo/library/create_repo.py index e6a61bad0e7..8d880ab9028 100644 --- a/test/integration/targets/setup_rpm_repo/library/create_repo.py +++ b/test/integration/targets/setup_rpm_repo/library/create_repo.py @@ -1,7 +1,6 @@ #!/usr/bin/python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import subprocess import sys diff --git a/test/integration/targets/shell/action_plugins/test_shell.py b/test/integration/targets/shell/action_plugins/test_shell.py index 6e66ed078d6..17fa4d984ca 100644 --- a/test/integration/targets/shell/action_plugins/test_shell.py +++ b/test/integration/targets/shell/action_plugins/test_shell.py @@ -3,9 +3,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/shell/connection_plugins/test_connection_default.py b/test/integration/targets/shell/connection_plugins/test_connection_default.py index 60feedd6cda..6f13102b075 100644 --- a/test/integration/targets/shell/connection_plugins/test_connection_default.py +++ b/test/integration/targets/shell/connection_plugins/test_connection_default.py @@ -1,8 +1,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' connection: test_connection_default diff --git a/test/integration/targets/shell/connection_plugins/test_connection_override.py b/test/integration/targets/shell/connection_plugins/test_connection_override.py index d26d2b529fd..b962dfa75fa 100644 --- a/test/integration/targets/shell/connection_plugins/test_connection_override.py +++ b/test/integration/targets/shell/connection_plugins/test_connection_override.py @@ -1,8 +1,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = ''' connection: test_connection_override diff --git a/test/integration/targets/support-callback_plugins/callback_plugins/callback_debug.py b/test/integration/targets/support-callback_plugins/callback_plugins/callback_debug.py index 2462c1ff3fc..b1c0a623e94 100644 --- a/test/integration/targets/support-callback_plugins/callback_plugins/callback_debug.py +++ b/test/integration/targets/support-callback_plugins/callback_plugins/callback_debug.py @@ -1,8 +1,7 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.callback import CallbackBase diff --git a/test/integration/targets/template/role_filter/filter_plugins/myplugin.py b/test/integration/targets/template/role_filter/filter_plugins/myplugin.py index b0a8889439a..6043fdfe0f2 100644 --- a/test/integration/targets/template/role_filter/filter_plugins/myplugin.py +++ b/test/integration/targets/template/role_filter/filter_plugins/myplugin.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class FilterModule(object): diff --git a/test/integration/targets/templating_lookups/template_lookups/mock_lookup_plugins/77788.py b/test/integration/targets/templating_lookups/template_lookups/mock_lookup_plugins/77788.py index 436ceaf3916..99a44adf52d 100644 --- a/test/integration/targets/templating_lookups/template_lookups/mock_lookup_plugins/77788.py +++ b/test/integration/targets/templating_lookups/template_lookups/mock_lookup_plugins/77788.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from ansible.plugins.lookup import LookupBase diff --git a/test/integration/targets/test_utils/scripts/timeout.py b/test/integration/targets/test_utils/scripts/timeout.py index f88f3e4e15c..996071203ed 100755 --- a/test/integration/targets/test_utils/scripts/timeout.py +++ b/test/integration/targets/test_utils/scripts/timeout.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import annotations import argparse import subprocess diff --git a/test/integration/targets/throttle/test_throttle.py b/test/integration/targets/throttle/test_throttle.py index 1a5bdd30789..95bb217f704 100755 --- a/test/integration/targets/throttle/test_throttle.py +++ b/test/integration/targets/throttle/test_throttle.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import sys diff --git a/test/integration/targets/unexpected_executor_exception/action_plugins/unexpected.py b/test/integration/targets/unexpected_executor_exception/action_plugins/unexpected.py index 77fe58fb35f..358ff34510a 100644 --- a/test/integration/targets/unexpected_executor_exception/action_plugins/unexpected.py +++ b/test/integration/targets/unexpected_executor_exception/action_plugins/unexpected.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/until/action_plugins/shell_no_failed.py b/test/integration/targets/until/action_plugins/shell_no_failed.py index 594c0140331..5072b47d01e 100644 --- a/test/integration/targets/until/action_plugins/shell_no_failed.py +++ b/test/integration/targets/until/action_plugins/shell_no_failed.py @@ -1,8 +1,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase diff --git a/test/integration/targets/uri/files/testserver.py b/test/integration/targets/uri/files/testserver.py index 24967d4f0d8..308426441fe 100644 --- a/test/integration/targets/uri/files/testserver.py +++ b/test/integration/targets/uri/files/testserver.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/integration/targets/var_precedence/ansible-var-precedence-check.py b/test/integration/targets/var_precedence/ansible-var-precedence-check.py index b03c87b80f4..6511169014b 100755 --- a/test/integration/targets/var_precedence/ansible-var-precedence-check.py +++ b/test/integration/targets/var_precedence/ansible-var-precedence-check.py @@ -3,8 +3,7 @@ # A tool to check the order of precedence for ansible variables # https://github.com/ansible/ansible/blob/devel/test/integration/test_var_precedence.yml -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/test/integration/targets/wait_for/files/testserver.py b/test/integration/targets/wait_for/files/testserver.py index 2b728b6c10e..8a7e4425fbb 100644 --- a/test/integration/targets/wait_for/files/testserver.py +++ b/test/integration/targets/wait_for/files/testserver.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/integration/targets/wait_for/files/write_utf16.py b/test/integration/targets/wait_for/files/write_utf16.py index 6079ed33b02..fca04cac619 100644 --- a/test/integration/targets/wait_for/files/write_utf16.py +++ b/test/integration/targets/wait_for/files/write_utf16.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/integration/targets/wait_for/files/zombie.py b/test/integration/targets/wait_for/files/zombie.py index 913074eb909..19437ea05b6 100644 --- a/test/integration/targets/wait_for/files/zombie.py +++ b/test/integration/targets/wait_for/files/zombie.py @@ -1,5 +1,4 @@ -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os import sys diff --git a/test/integration/targets/want_json_modules_posix/library/helloworld.py b/test/integration/targets/want_json_modules_posix/library/helloworld.py index 80f876175d9..e32a203a96e 100644 --- a/test/integration/targets/want_json_modules_posix/library/helloworld.py +++ b/test/integration/targets/want_json_modules_posix/library/helloworld.py @@ -16,8 +16,7 @@ # WANT_JSON -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/integration/targets/win_exec_wrapper/action_plugins/test_rc_1.py b/test/integration/targets/win_exec_wrapper/action_plugins/test_rc_1.py index 60cffde96bb..1cc92b814b3 100644 --- a/test/integration/targets/win_exec_wrapper/action_plugins/test_rc_1.py +++ b/test/integration/targets/win_exec_wrapper/action_plugins/test_rc_1.py @@ -1,5 +1,6 @@ # Copyright: (c) 2023, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations import json diff --git a/test/integration/targets/yum/filter_plugins/filter_list_of_tuples_by_first_param.py b/test/integration/targets/yum/filter_plugins/filter_list_of_tuples_by_first_param.py index 306ccd9aa80..86d6885a335 100644 --- a/test/integration/targets/yum/filter_plugins/filter_list_of_tuples_by_first_param.py +++ b/test/integration/targets/yum/filter_plugins/filter_list_of_tuples_by_first_param.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def filter_list_of_tuples_by_first_param(lst, search, startswith=False): diff --git a/test/sanity/code-smell/ansible-test-future-boilerplate.json b/test/sanity/code-smell/ansible-test-future-boilerplate.json deleted file mode 100644 index ca4c067ab32..00000000000 --- a/test/sanity/code-smell/ansible-test-future-boilerplate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extensions": [ - ".py" - ], - "prefixes": [ - "test/sanity/", - "test/lib/ansible_test/" - ], - "output": "path-message" -} diff --git a/test/sanity/code-smell/future-boilerplate.json b/test/sanity/code-smell/future-boilerplate.json new file mode 100644 index 00000000000..6f1edb783ce --- /dev/null +++ b/test/sanity/code-smell/future-boilerplate.json @@ -0,0 +1,6 @@ +{ + "extensions": [ + ".py" + ], + "output": "path-message" +} diff --git a/test/sanity/code-smell/ansible-test-future-boilerplate.py b/test/sanity/code-smell/future-boilerplate.py similarity index 87% rename from test/sanity/code-smell/ansible-test-future-boilerplate.py rename to test/sanity/code-smell/future-boilerplate.py index 74128ec7008..b20ef5d5ab8 100644 --- a/test/sanity/code-smell/ansible-test-future-boilerplate.py +++ b/test/sanity/code-smell/future-boilerplate.py @@ -21,7 +21,7 @@ def main(): missing = False break - if text.startswith(b'from __future__ ') or text == b'__metaclass__ = type': + if text.strip().startswith(b'from __future__ ') or text.strip().startswith(b'__metaclass__ '): invalid_future.append(text.decode()) if missing: @@ -33,7 +33,6 @@ def main(): node = ast.parse(contents) # files consisting of only assignments have no need for future import boilerplate - # the only exception would be division during assignment, but we'll overlook that for simplicity # the most likely case is that of a documentation only python file if all(isinstance(statement, ast.Assign) for statement in node.body): missing = False diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index 041962e0d3c..de740937dff 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -135,7 +135,6 @@ test/integration/targets/win_script/files/test_script_removes_file.ps1 pslint:PS test/integration/targets/win_script/files/test_script_with_args.ps1 pslint:PSAvoidUsingWriteHost # Keep test/integration/targets/win_script/files/test_script_with_splatting.ps1 pslint:PSAvoidUsingWriteHost # Keep test/lib/ansible_test/_data/requirements/sanity.pslint.ps1 pslint:PSCustomUseLiteralPath # Uses wildcards on purpose -test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/compat/ipaddress.py no-unicode-literals test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/cliconf/ios.py pylint:arguments-renamed test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/cliconf/vyos.py pylint:arguments-renamed test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/module_utils/WebRequest.psm1 pslint!skip diff --git a/test/support/integration/plugins/filter/json_query.py b/test/support/integration/plugins/filter/json_query.py index d1da71b4761..af5da901876 100644 --- a/test/support/integration/plugins/filter/json_query.py +++ b/test/support/integration/plugins/filter/json_query.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleError, AnsibleFilterError diff --git a/test/support/integration/plugins/modules/htpasswd.py b/test/support/integration/plugins/modules/htpasswd.py index b8062cd1e6f..98088d9690c 100644 --- a/test/support/integration/plugins/modules/htpasswd.py +++ b/test/support/integration/plugins/modules/htpasswd.py @@ -4,8 +4,7 @@ # (c) 2013, Nimbis Services, Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/support/integration/plugins/modules/pkgng.py b/test/support/integration/plugins/modules/pkgng.py index 1136347904b..85c563664b3 100644 --- a/test/support/integration/plugins/modules/pkgng.py +++ b/test/support/integration/plugins/modules/pkgng.py @@ -9,8 +9,7 @@ # # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/support/integration/plugins/modules/sefcontext.py b/test/support/integration/plugins/modules/sefcontext.py index 946ae880a66..7cb375fb199 100644 --- a/test/support/integration/plugins/modules/sefcontext.py +++ b/test/support/integration/plugins/modules/sefcontext.py @@ -4,8 +4,7 @@ # Copyright: (c) 2016, Dag Wieers (@dagwieers) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/test/support/integration/plugins/modules/timezone.py b/test/support/integration/plugins/modules/timezone.py index dd3748387ac..9da4038f573 100644 --- a/test/support/integration/plugins/modules/timezone.py +++ b/test/support/integration/plugins/modules/timezone.py @@ -4,8 +4,7 @@ # Copyright: (c) 2016, Shinichi TAMURA (@tmshn) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/test/support/integration/plugins/modules/zypper.py b/test/support/integration/plugins/modules/zypper.py index cd67b605ff3..dab10767abf 100644 --- a/test/support/integration/plugins/modules/zypper.py +++ b/test/support/integration/plugins/modules/zypper.py @@ -13,8 +13,7 @@ # # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/cli_config.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/cli_config.py index 089b339f5c8..1dbf890eaf3 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/cli_config.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/cli_config.py @@ -16,9 +16,8 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type from ansible_collections.ansible.netcommon.plugins.action.network import ( ActionModule as ActionNetworkModule, diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_get.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_get.py index c6dbb2cf9b4..448b970a46a 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_get.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_get.py @@ -14,9 +14,8 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import os import re diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_put.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_put.py index 6fa3b8d6e40..38403c7e2a0 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_put.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_put.py @@ -14,9 +14,8 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import os import uuid diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/network.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/network.py index fbcc9c13fac..5c4c9fad7dd 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/network.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/network.py @@ -16,9 +16,8 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import os import time diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/connection/network_cli.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/connection/network_cli.py index d0d977faa6c..467c4b78e65 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/connection/network_cli.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/connection/network_cli.py @@ -2,9 +2,8 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """ author: diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/connection/persistent.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/connection/persistent.py index c7379a63ad0..6866688736c 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/connection/persistent.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/connection/persistent.py @@ -2,9 +2,8 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """author: Ansible Core Team connection: persistent diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/doc_fragments/connection_persistent.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/doc_fragments/connection_persistent.py index d572c30b90e..506b559f03c 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/doc_fragments/connection_persistent.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/doc_fragments/connection_persistent.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations class ModuleDocFragment(object): diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/compat/ipaddress.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/compat/ipaddress.py index dc0a19f79b7..312f1d6b382 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/compat/ipaddress.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/compat/ipaddress.py @@ -60,7 +60,7 @@ and networks. """ -from __future__ import unicode_literals +from __future__ import annotations import itertools diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/cfg/base.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/cfg/base.py index 68608d1b4c2..75f80aa3f88 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/cfg/base.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/cfg/base.py @@ -6,6 +6,7 @@ """ The base class for all resource modules """ +from __future__ import annotations from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.network import ( get_resource_connection, diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/config.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/config.py index 64150405b0f..d6f278a53fd 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/config.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/config.py @@ -25,6 +25,8 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +from __future__ import annotations + import re import hashlib diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/facts/facts.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/facts/facts.py index 2afa650e43f..0a484d0607b 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/facts/facts.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/facts/facts.py @@ -7,6 +7,8 @@ The facts base class this contains methods common to all facts subsets """ +from __future__ import annotations + from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.network import ( get_resource_connection, ) diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/netconf.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/netconf.py index 1857f7dfbfb..4979dac9e22 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/netconf.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/netconf.py @@ -25,6 +25,8 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +from __future__ import annotations + import sys from ansible.module_utils.common.text.converters import to_text, to_bytes diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/network.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/network.py index 149b4413eec..c1f1d7b5b3f 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/network.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/network.py @@ -24,6 +24,7 @@ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +from __future__ import annotations import traceback import json diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/parsing.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/parsing.py index 2dd1de9e790..2e8e174e551 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/parsing.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/parsing.py @@ -24,6 +24,7 @@ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +from __future__ import annotations import re import shlex diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/utils.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/utils.py index 4095f5948d9..0b594ad8c72 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/utils.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/utils.py @@ -27,6 +27,7 @@ # # Networking tools for network modules only +from __future__ import annotations import re import ast diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/modules/cli_config.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/modules/cli_config.py index 9d07e85659f..ef6f102c02d 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/modules/cli_config.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/modules/cli_config.py @@ -4,9 +4,7 @@ # (c) 2018, Ansible by Red Hat, inc # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations ANSIBLE_METADATA = { diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/plugin_utils/connection_base.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/plugin_utils/connection_base.py index a38a775b93f..29faa8b6b23 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/plugin_utils/connection_base.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/plugin_utils/connection_base.py @@ -2,9 +2,8 @@ # (c) 2015 Toshio Kuratomi # (c) 2017, Peter Sprygada # (c) 2017 Ansible Project -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import os diff --git a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/action/ios.py b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/action/ios.py index e3605d0be6f..be708957b79 100644 --- a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/action/ios.py +++ b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/action/ios.py @@ -16,9 +16,8 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import sys import copy diff --git a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/cliconf/ios.py b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/cliconf/ios.py index b9cb19d7f7c..1b5cb459430 100644 --- a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/cliconf/ios.py +++ b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/cliconf/ios.py @@ -16,9 +16,8 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """ --- diff --git a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/doc_fragments/ios.py b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/doc_fragments/ios.py index ff22d27cc9f..1b4ede27ec8 100644 --- a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/doc_fragments/ios.py +++ b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/doc_fragments/ios.py @@ -2,6 +2,7 @@ # Copyright: (c) 2015, Peter Sprygada # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations class ModuleDocFragment(object): diff --git a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/module_utils/network/ios/ios.py b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/module_utils/network/ios/ios.py index c16d84c6a04..a21e047547b 100644 --- a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/module_utils/network/ios/ios.py +++ b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/module_utils/network/ios/ios.py @@ -25,6 +25,8 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +from __future__ import annotations + import json from ansible.module_utils.common.text.converters import to_text diff --git a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/modules/ios_command.py b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/modules/ios_command.py index 0b3be2a98c7..9486a03c91f 100644 --- a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/modules/ios_command.py +++ b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/modules/ios_command.py @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # +from __future__ import annotations ANSIBLE_METADATA = { "metadata_version": "1.1", diff --git a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/modules/ios_config.py b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/modules/ios_config.py index 5048bbb5161..f9b49a17b8f 100644 --- a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/modules/ios_config.py +++ b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/modules/ios_config.py @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # +from __future__ import annotations ANSIBLE_METADATA = { "metadata_version": "1.1", diff --git a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/terminal/ios.py b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/terminal/ios.py index 9716952964d..7194eb459e1 100644 --- a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/terminal/ios.py +++ b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/terminal/ios.py @@ -16,9 +16,8 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import json import re diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/action/vyos.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/action/vyos.py index b86a0c42c96..7865916b40c 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/action/vyos.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/action/vyos.py @@ -16,9 +16,8 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import sys import copy diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/cliconf/vyos.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/cliconf/vyos.py index 1f351dc5920..ca54c91652f 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/cliconf/vyos.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/cliconf/vyos.py @@ -16,9 +16,8 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type DOCUMENTATION = """ --- diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/doc_fragments/vyos.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/doc_fragments/vyos.py index 094963f15fd..a7f8c124745 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/doc_fragments/vyos.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/doc_fragments/vyos.py @@ -2,6 +2,7 @@ # Copyright: (c) 2015, Peter Sprygada # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations class ModuleDocFragment(object): diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/facts/facts.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/facts/facts.py index 46fabaa2356..afe04ba0a62 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/facts/facts.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/facts/facts.py @@ -4,9 +4,7 @@ """ The arg spec for the vyos facts module. """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations class FactsArgs(object): # pylint: disable=R0903 diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/firewall_rules/firewall_rules.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/firewall_rules/firewall_rules.py index a018cc0b970..51822acd320 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/firewall_rules/firewall_rules.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/firewall_rules/firewall_rules.py @@ -25,9 +25,7 @@ The arg spec for the vyos_firewall_rules module """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations class Firewall_rulesArgs(object): # pylint: disable=R0903 diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/interfaces/interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/interfaces/interfaces.py index 3542cb19dba..7bf0c229da7 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/interfaces/interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/interfaces/interfaces.py @@ -23,9 +23,7 @@ The arg spec for the vyos_interfaces module """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations class InterfacesArgs(object): # pylint: disable=R0903 diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/l3_interfaces/l3_interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/l3_interfaces/l3_interfaces.py index 91434e4be83..9ce2af58657 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/l3_interfaces/l3_interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/l3_interfaces/l3_interfaces.py @@ -26,9 +26,7 @@ The arg spec for the vyos_l3_interfaces module """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations class L3_interfacesArgs(object): # pylint: disable=R0903 diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lag_interfaces/lag_interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lag_interfaces/lag_interfaces.py index 97c5d5a2fdc..b68513f2c61 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lag_interfaces/lag_interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lag_interfaces/lag_interfaces.py @@ -23,9 +23,7 @@ """ The arg spec for the vyos_lag_interfaces module """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations class Lag_interfacesArgs(object): # pylint: disable=R0903 diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lldp_global/lldp_global.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lldp_global/lldp_global.py index 84bbc00cce4..d56ff21981e 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lldp_global/lldp_global.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lldp_global/lldp_global.py @@ -23,9 +23,7 @@ """ The arg spec for the vyos_lldp_global module """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations class Lldp_globalArgs(object): # pylint: disable=R0903 diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py index 2976fc09d83..7a639fe02b6 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py @@ -25,9 +25,7 @@ The arg spec for the vyos_lldp_interfaces module """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations class Lldp_interfacesArgs(object): # pylint: disable=R0903 diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/static_routes/static_routes.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/static_routes/static_routes.py index 8ecd955ab91..191dc76b5cd 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/static_routes/static_routes.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/argspec/static_routes/static_routes.py @@ -25,9 +25,7 @@ The arg spec for the vyos_static_routes module """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations class Static_routesArgs(object): # pylint: disable=R0903 diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py index 377fec9aab1..5b61427f35d 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py @@ -11,9 +11,7 @@ necessary to bring the current configuration to it's desired end-state is created """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.cfg.base import ( diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/facts.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/facts.py index 8f0a3bb66c7..f174849ec27 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/facts.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/facts.py @@ -6,9 +6,8 @@ The facts class for vyos this file validates each subset of facts and selectively calls the appropriate facts gathering function """ -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.facts.facts import ( FactsBase, ) diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py index 971ea6fedf3..6e583f615a1 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py @@ -9,9 +9,8 @@ It is in this file the configuration is collected from the device for a given resource, parsed, and the facts tree is populated based on the configuration. """ -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type from re import findall, search, M from copy import deepcopy diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/interfaces/interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/interfaces/interfaces.py index 4b24803b33d..e3bb52ceca5 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/interfaces/interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/interfaces/interfaces.py @@ -10,9 +10,7 @@ for a given resource, parsed, and the facts tree is populated based on the configuration. """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations from re import findall, M diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/l3_interfaces/l3_interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/l3_interfaces/l3_interfaces.py index d1d62c23195..944629c86ec 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/l3_interfaces/l3_interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/l3_interfaces/l3_interfaces.py @@ -10,9 +10,7 @@ for a given resource, parsed, and the facts tree is populated based on the configuration. """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations import re diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py index 9201e5c6198..b26dfd14034 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py @@ -9,9 +9,8 @@ It is in this file the configuration is collected from the device for a given resource, parsed, and the facts tree is populated based on the configuration. """ -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type from re import findall, search, M from copy import deepcopy diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/legacy/base.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/legacy/base.py index f6b343e0725..c5294b5feb9 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/legacy/base.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/legacy/base.py @@ -9,9 +9,8 @@ for a given resource, parsed, and the facts tree is populated based on the configuration. """ -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import platform import re from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import ( diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lldp_global/lldp_global.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lldp_global/lldp_global.py index 3c7e2f93096..10f239f1141 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lldp_global/lldp_global.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lldp_global/lldp_global.py @@ -9,9 +9,8 @@ It is in this file the configuration is collected from the device for a given resource, parsed, and the facts tree is populated based on the configuration. """ -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type from re import findall, M from copy import deepcopy diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py index dcfbc6ee068..d9d59b1bc54 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py @@ -10,9 +10,7 @@ for a given resource, parsed, and the facts tree is populated based on the configuration. """ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations from re import findall, search, M diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/static_routes/static_routes.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/static_routes/static_routes.py index 00049475d8e..7ca7f209e9e 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/static_routes/static_routes.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/facts/static_routes/static_routes.py @@ -10,9 +10,8 @@ for a given resource, parsed, and the facts tree is populated based on the configuration. """ -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type from re import findall, search, M from copy import deepcopy from ansible_collections.ansible.netcommon.plugins.module_utils.network.common import ( diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/utils/utils.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/utils/utils.py index 402adfc9acc..1a6a7248efd 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/utils/utils.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/utils/utils.py @@ -4,9 +4,8 @@ # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # utils -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type from ansible.module_utils.six import iteritems from ansible_collections.ansible.netcommon.plugins.module_utils.compat import ( ipaddress, diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/vyos.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/vyos.py index 7e8b204893a..274a4639e04 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/vyos.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/module_utils/network/vyos/vyos.py @@ -25,6 +25,8 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +from __future__ import annotations + import json from ansible.module_utils.common.text.converters import to_text diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_command.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_command.py index 7f7c30c2f57..ed90aea241d 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_command.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_command.py @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # +from __future__ import annotations ANSIBLE_METADATA = { "metadata_version": "1.1", diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_config.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_config.py index e65f3ffd2e9..fdd42f6ee59 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_config.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_config.py @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # +from __future__ import annotations ANSIBLE_METADATA = { "metadata_version": "1.1", diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_facts.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_facts.py index 19fb727f0bc..d9fb2360ea8 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_facts.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_facts.py @@ -6,6 +6,7 @@ """ The module file for vyos_facts """ +from __future__ import annotations ANSIBLE_METADATA = { diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_lldp_interfaces.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_lldp_interfaces.py index 8fe572b01ff..d18f3f7daea 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_lldp_interfaces.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/modules/vyos_lldp_interfaces.py @@ -26,9 +26,8 @@ The module file for vyos_lldp_interfaces """ -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type ANSIBLE_METADATA = { "metadata_version": "1.1", diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/terminal/vyos.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/terminal/vyos.py index fe7712f6c98..77ef3e2c9dc 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/terminal/vyos.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/terminal/vyos.py @@ -16,9 +16,8 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import os import re diff --git a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/action/win_reboot.py b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/action/win_reboot.py index f1fad4d8008..8d667378181 100644 --- a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/action/win_reboot.py +++ b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/action/win_reboot.py @@ -1,8 +1,7 @@ # Copyright: (c) 2018, Matt Davis # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleError from ansible.module_utils.common.text.converters import to_native diff --git a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_quote.py b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_quote.py index 718a09905eb..d01386efc75 100644 --- a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_quote.py +++ b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_quote.py @@ -14,8 +14,7 @@ not final and could be subject to change. # See also: https://github.com/ansible/community/issues/539#issuecomment-780839686 # Please open an issue if you have questions about this. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_reboot.py b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_reboot.py index 2399ee48ca3..ca0adcf34e9 100644 --- a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_reboot.py +++ b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_reboot.py @@ -13,6 +13,7 @@ interface is not final and count be subject to change. # and may not remain stable to outside uses. Changes may be made in ANY release, even a bugfix release. # See also: https://github.com/ansible/community/issues/539#issuecomment-780839686 # Please open an issue if you have questions about this. +from __future__ import annotations import datetime import json diff --git a/test/support/windows-integration/plugins/action/win_copy.py b/test/support/windows-integration/plugins/action/win_copy.py index 79f72ef6afd..bcecae4bd45 100644 --- a/test/support/windows-integration/plugins/action/win_copy.py +++ b/test/support/windows-integration/plugins/action/win_copy.py @@ -3,9 +3,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import base64 import json diff --git a/test/support/windows-integration/plugins/action/win_reboot.py b/test/support/windows-integration/plugins/action/win_reboot.py index 76f4a66bd4c..a2dfe906e86 100644 --- a/test/support/windows-integration/plugins/action/win_reboot.py +++ b/test/support/windows-integration/plugins/action/win_reboot.py @@ -1,8 +1,7 @@ # Copyright: (c) 2018, Matt Davis # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from datetime import datetime, timezone diff --git a/test/support/windows-integration/plugins/action/win_template.py b/test/support/windows-integration/plugins/action/win_template.py index 20494b93e77..dd5c0bc79d7 100644 --- a/test/support/windows-integration/plugins/action/win_template.py +++ b/test/support/windows-integration/plugins/action/win_template.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.action import ActionBase from ansible.plugins.action.template import ActionModule as TemplateActionModule diff --git a/test/support/windows-integration/plugins/become/runas.py b/test/support/windows-integration/plugins/become/runas.py index c8ae881c3c2..80cbe75ee2e 100644 --- a/test/support/windows-integration/plugins/become/runas.py +++ b/test/support/windows-integration/plugins/become/runas.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ become: runas diff --git a/test/units/_vendor/test_vendor.py b/test/units/_vendor/test_vendor.py index 265f5b27b9a..1cbe7452ec0 100644 --- a/test/units/_vendor/test_vendor.py +++ b/test/units/_vendor/test_vendor.py @@ -1,5 +1,6 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import annotations import os import pkgutil diff --git a/test/units/ansible_test/ci/test_azp.py b/test/units/ansible_test/ci/test_azp.py index 69c4fa49b4b..66cef83b35e 100644 --- a/test/units/ansible_test/ci/test_azp.py +++ b/test/units/ansible_test/ci/test_azp.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from .util import common_auth_test diff --git a/test/units/ansible_test/ci/util.py b/test/units/ansible_test/ci/util.py index 2273f0ab6b0..75ba27cc86b 100644 --- a/test/units/ansible_test/ci/util.py +++ b/test/units/ansible_test/ci/util.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import base64 import json diff --git a/test/units/ansible_test/conftest.py b/test/units/ansible_test/conftest.py index 9ec9a02f786..20e30aeb554 100644 --- a/test/units/ansible_test/conftest.py +++ b/test/units/ansible_test/conftest.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/cli/arguments/test_optparse_helpers.py b/test/units/cli/arguments/test_optparse_helpers.py index ae8e8d73ec9..3af067276ce 100644 --- a/test/units/cli/arguments/test_optparse_helpers.py +++ b/test/units/cli/arguments/test_optparse_helpers.py @@ -2,8 +2,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/units/cli/galaxy/test_collection_extract_tar.py b/test/units/cli/galaxy/test_collection_extract_tar.py index b84f60b619f..521a5e76087 100644 --- a/test/units/cli/galaxy/test_collection_extract_tar.py +++ b/test/units/cli/galaxy/test_collection_extract_tar.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/cli/galaxy/test_display_collection.py b/test/units/cli/galaxy/test_display_collection.py index c86227b0b21..a7b3753efe4 100644 --- a/test/units/cli/galaxy/test_display_collection.py +++ b/test/units/cli/galaxy/test_display_collection.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/cli/galaxy/test_display_header.py b/test/units/cli/galaxy/test_display_header.py index ae926b0da1f..2b5325f1fe5 100644 --- a/test/units/cli/galaxy/test_display_header.py +++ b/test/units/cli/galaxy/test_display_header.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.cli.galaxy import _display_header diff --git a/test/units/cli/galaxy/test_display_role.py b/test/units/cli/galaxy/test_display_role.py index e23a7725770..dd454a4779d 100644 --- a/test/units/cli/galaxy/test_display_role.py +++ b/test/units/cli/galaxy/test_display_role.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.cli.galaxy import _display_role diff --git a/test/units/cli/galaxy/test_execute_list.py b/test/units/cli/galaxy/test_execute_list.py index 41fee0bfc79..1fde1caf49a 100644 --- a/test/units/cli/galaxy/test_execute_list.py +++ b/test/units/cli/galaxy/test_execute_list.py @@ -3,8 +3,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/cli/galaxy/test_execute_list_collection.py b/test/units/cli/galaxy/test_execute_list_collection.py index 5641cb86a99..0ba24e993c3 100644 --- a/test/units/cli/galaxy/test_execute_list_collection.py +++ b/test/units/cli/galaxy/test_execute_list_collection.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pathlib diff --git a/test/units/cli/galaxy/test_get_collection_widths.py b/test/units/cli/galaxy/test_get_collection_widths.py index 6e1cbf5e632..df1f0dfa2f2 100644 --- a/test/units/cli/galaxy/test_get_collection_widths.py +++ b/test/units/cli/galaxy/test_get_collection_widths.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/cli/test_adhoc.py b/test/units/cli/test_adhoc.py index 7bcca4714a1..9e0a9cd787f 100644 --- a/test/units/cli/test_adhoc.py +++ b/test/units/cli/test_adhoc.py @@ -1,8 +1,7 @@ # Copyright: (c) 2018, Abhijeet Kasurde # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest import re diff --git a/test/units/cli/test_cli.py b/test/units/cli/test_cli.py index 79c2b8fb988..988a4d9b549 100644 --- a/test/units/cli/test_cli.py +++ b/test/units/cli/test_cli.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from unittest.mock import patch, MagicMock diff --git a/test/units/cli/test_console.py b/test/units/cli/test_console.py index 4fc05dd36aa..81ea20966b2 100644 --- a/test/units/cli/test_console.py +++ b/test/units/cli/test_console.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from unittest.mock import patch diff --git a/test/units/cli/test_doc.py b/test/units/cli/test_doc.py index 50b714eb79e..84e2df9edf0 100644 --- a/test/units/cli/test_doc.py +++ b/test/units/cli/test_doc.py @@ -1,6 +1,4 @@ -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py index f783abb9b95..665547c8754 100644 --- a/test/units/cli/test_galaxy.py +++ b/test/units/cli/test_galaxy.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import contextlib diff --git a/test/units/cli/test_playbook.py b/test/units/cli/test_playbook.py index f25e54dfc37..b2521a58e19 100644 --- a/test/units/cli/test_playbook.py +++ b/test/units/cli/test_playbook.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from units.mock.loader import DictDataLoader diff --git a/test/units/cli/test_vault.py b/test/units/cli/test_vault.py index f1399c3fa16..703e283ae37 100644 --- a/test/units/cli/test_vault.py +++ b/test/units/cli/test_vault.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import pytest diff --git a/test/units/compat/mock.py b/test/units/compat/mock.py index 031546093eb..fc296b90815 100644 --- a/test/units/compat/mock.py +++ b/test/units/compat/mock.py @@ -2,8 +2,7 @@ Compatibility shim for mock imports in modules and module_utils. This can be removed once support for Python 2.7 is dropped. """ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations try: from unittest.mock import ( # pylint: disable=unused-import diff --git a/test/units/compat/unittest.py b/test/units/compat/unittest.py index b4167741761..5295a91e820 100644 --- a/test/units/compat/unittest.py +++ b/test/units/compat/unittest.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # Allow wildcard import because we really do want to import all of # unittests's symbols into this compat shim diff --git a/test/units/config/manager/test_find_ini_config_file.py b/test/units/config/manager/test_find_ini_config_file.py index e67eecd9cfd..2fee915f852 100644 --- a/test/units/config/manager/test_find_ini_config_file.py +++ b/test/units/config/manager/test_find_ini_config_file.py @@ -2,9 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import os.path diff --git a/test/units/config/test_manager.py b/test/units/config/test_manager.py index 0848276c4b4..5a96da45ad8 100644 --- a/test/units/config/test_manager.py +++ b/test/units/config/test_manager.py @@ -2,9 +2,7 @@ # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import os.path diff --git a/test/units/errors/test_errors.py b/test/units/errors/test_errors.py index 7a1de3dd9e9..d9ac668adcd 100644 --- a/test/units/errors/test_errors.py +++ b/test/units/errors/test_errors.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest diff --git a/test/units/executor/module_common/conftest.py b/test/units/executor/module_common/conftest.py index f0eef12e57f..d1fb8887c2b 100644 --- a/test/units/executor/module_common/conftest.py +++ b/test/units/executor/module_common/conftest.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import pytest diff --git a/test/units/executor/module_common/test_modify_module.py b/test/units/executor/module_common/test_modify_module.py index 89e4a163f8b..0ea191826ec 100644 --- a/test/units/executor/module_common/test_modify_module.py +++ b/test/units/executor/module_common/test_modify_module.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/executor/module_common/test_module_common.py b/test/units/executor/module_common/test_module_common.py index 6e2a4956c4e..c7edce6b2df 100644 --- a/test/units/executor/module_common/test_module_common.py +++ b/test/units/executor/module_common/test_module_common.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os.path diff --git a/test/units/executor/module_common/test_recursive_finder.py b/test/units/executor/module_common/test_recursive_finder.py index 7939dc76ee9..5058d6da2ff 100644 --- a/test/units/executor/module_common/test_recursive_finder.py +++ b/test/units/executor/module_common/test_recursive_finder.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import pytest diff --git a/test/units/executor/test_interpreter_discovery.py b/test/units/executor/test_interpreter_discovery.py index e30e98d0363..35d0dacd104 100644 --- a/test/units/executor/test_interpreter_discovery.py +++ b/test/units/executor/test_interpreter_discovery.py @@ -2,9 +2,7 @@ # (c) 2019, Jordan Borean # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest from unittest.mock import MagicMock diff --git a/test/units/executor/test_play_iterator.py b/test/units/executor/test_play_iterator.py index 0fc59756fd6..a5325238a63 100644 --- a/test/units/executor/test_play_iterator.py +++ b/test/units/executor/test_play_iterator.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from unittest.mock import patch, MagicMock diff --git a/test/units/executor/test_playbook_executor.py b/test/units/executor/test_playbook_executor.py index 6032dbb2abd..30abb444792 100644 --- a/test/units/executor/test_playbook_executor.py +++ b/test/units/executor/test_playbook_executor.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from unittest.mock import MagicMock diff --git a/test/units/executor/test_task_executor.py b/test/units/executor/test_task_executor.py index 66ab00368e1..de4eacc2661 100644 --- a/test/units/executor/test_task_executor.py +++ b/test/units/executor/test_task_executor.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from unittest import mock diff --git a/test/units/executor/test_task_queue_manager_callbacks.py b/test/units/executor/test_task_queue_manager_callbacks.py index c63385dc8b6..fd304534c97 100644 --- a/test/units/executor/test_task_queue_manager_callbacks.py +++ b/test/units/executor/test_task_queue_manager_callbacks.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) +from __future__ import annotations from units.compat import unittest from unittest.mock import MagicMock @@ -26,8 +25,6 @@ from ansible.playbook import Playbook from ansible.plugins.callback import CallbackBase from ansible.utils import context_objects as co -__metaclass__ = type - class TestTaskQueueManagerCallbacks(unittest.TestCase): def setUp(self): diff --git a/test/units/executor/test_task_result.py b/test/units/executor/test_task_result.py index 8b79571f23e..0bcf04896c3 100644 --- a/test/units/executor/test_task_result.py +++ b/test/units/executor/test_task_result.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from unittest.mock import patch, MagicMock diff --git a/test/units/galaxy/test_api.py b/test/units/galaxy/test_api.py index b019f1aa166..b94bbb1f256 100644 --- a/test/units/galaxy/test_api.py +++ b/test/units/galaxy/test_api.py @@ -2,9 +2,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/test/units/galaxy/test_collection.py b/test/units/galaxy/test_collection.py index e8230d21073..3030d7b701f 100644 --- a/test/units/galaxy/test_collection.py +++ b/test/units/galaxy/test_collection.py @@ -2,9 +2,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/test/units/galaxy/test_collection_install.py b/test/units/galaxy/test_collection_install.py index a61ae406832..9ab0f1a94be 100644 --- a/test/units/galaxy/test_collection_install.py +++ b/test/units/galaxy/test_collection_install.py @@ -2,9 +2,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import copy import json diff --git a/test/units/galaxy/test_role_install.py b/test/units/galaxy/test_role_install.py index 96ae0ce0d4d..404c8e91e01 100644 --- a/test/units/galaxy/test_role_install.py +++ b/test/units/galaxy/test_role_install.py @@ -2,9 +2,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/galaxy/test_role_requirements.py b/test/units/galaxy/test_role_requirements.py index a84bbb52eda..6b7011a500c 100644 --- a/test/units/galaxy/test_role_requirements.py +++ b/test/units/galaxy/test_role_requirements.py @@ -2,9 +2,7 @@ # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/galaxy/test_token.py b/test/units/galaxy/test_token.py index 9fc12d4672f..a02076e640e 100644 --- a/test/units/galaxy/test_token.py +++ b/test/units/galaxy/test_token.py @@ -2,9 +2,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import pytest diff --git a/test/units/galaxy/test_user_agent.py b/test/units/galaxy/test_user_agent.py index da0103f3956..f771324b2dd 100644 --- a/test/units/galaxy/test_user_agent.py +++ b/test/units/galaxy/test_user_agent.py @@ -2,8 +2,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import platform diff --git a/test/units/inventory/test_group.py b/test/units/inventory/test_group.py index e8f1c0b02fe..7fb5f96f44b 100644 --- a/test/units/inventory/test_group.py +++ b/test/units/inventory/test_group.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest diff --git a/test/units/inventory/test_host.py b/test/units/inventory/test_host.py index 712ed302b7a..a7dacda9f5d 100644 --- a/test/units/inventory/test_host.py +++ b/test/units/inventory/test_host.py @@ -17,8 +17,7 @@ # for __setstate__/__getstate__ tests -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pickle diff --git a/test/units/mock/loader.py b/test/units/mock/loader.py index 9dc32caedb0..d43ed23d0a9 100644 --- a/test/units/mock/loader.py +++ b/test/units/mock/loader.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/mock/path.py b/test/units/mock/path.py index c24ddf42dcc..09bedae318f 100644 --- a/test/units/mock/path.py +++ b/test/units/mock/path.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from unittest.mock import MagicMock from ansible.utils.path import unfrackpath diff --git a/test/units/mock/procenv.py b/test/units/mock/procenv.py index 1570c87e210..5618e7b6c71 100644 --- a/test/units/mock/procenv.py +++ b/test/units/mock/procenv.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys import json diff --git a/test/units/mock/vault_helper.py b/test/units/mock/vault_helper.py index 5b2fdd2a38c..1b40e381a1f 100644 --- a/test/units/mock/vault_helper.py +++ b/test/units/mock/vault_helper.py @@ -11,9 +11,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.text.converters import to_bytes diff --git a/test/units/mock/yaml_helper.py b/test/units/mock/yaml_helper.py index 9f8b063b6b2..0f8b2b9bfad 100644 --- a/test/units/mock/yaml_helper.py +++ b/test/units/mock/yaml_helper.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import io import yaml diff --git a/test/units/module_utils/basic/test__log_invocation.py b/test/units/module_utils/basic/test__log_invocation.py index 3beda8bda93..7936833ebe1 100644 --- a/test/units/module_utils/basic/test__log_invocation.py +++ b/test/units/module_utils/basic/test__log_invocation.py @@ -3,8 +3,7 @@ # (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/basic/test__symbolic_mode_to_octal.py b/test/units/module_utils/basic/test__symbolic_mode_to_octal.py index b3a73e5a6ea..e72f9e18fe0 100644 --- a/test/units/module_utils/basic/test__symbolic_mode_to_octal.py +++ b/test/units/module_utils/basic/test__symbolic_mode_to_octal.py @@ -4,9 +4,7 @@ # (c) 2016-2017 Ansible Project # License: GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/basic/test_argument_spec.py b/test/units/module_utils/basic/test_argument_spec.py index 5dbaf50c1c8..ac5a4dfb49e 100644 --- a/test/units/module_utils/basic/test_argument_spec.py +++ b/test/units/module_utils/basic/test_argument_spec.py @@ -4,8 +4,7 @@ # Copyright: Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/test/units/module_utils/basic/test_atomic_move.py b/test/units/module_utils/basic/test_atomic_move.py index bbdb0519664..a2f74d9ef1a 100644 --- a/test/units/module_utils/basic/test_atomic_move.py +++ b/test/units/module_utils/basic/test_atomic_move.py @@ -4,8 +4,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os import errno diff --git a/test/units/module_utils/basic/test_command_nonexisting.py b/test/units/module_utils/basic/test_command_nonexisting.py index 0dd3bd9883a..c995745ff70 100644 --- a/test/units/module_utils/basic/test_command_nonexisting.py +++ b/test/units/module_utils/basic/test_command_nonexisting.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/units/module_utils/basic/test_deprecate_warn.py b/test/units/module_utils/basic/test_deprecate_warn.py index 581ba6dafc0..7a5426491d6 100644 --- a/test/units/module_utils/basic/test_deprecate_warn.py +++ b/test/units/module_utils/basic/test_deprecate_warn.py @@ -3,8 +3,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/units/module_utils/basic/test_dict_converters.py b/test/units/module_utils/basic/test_dict_converters.py index f63ed9c6edc..b4d6755f3c0 100644 --- a/test/units/module_utils/basic/test_dict_converters.py +++ b/test/units/module_utils/basic/test_dict_converters.py @@ -4,8 +4,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from units.mock.procenv import ModuleTestCase diff --git a/test/units/module_utils/basic/test_exit_json.py b/test/units/module_utils/basic/test_exit_json.py index 4afcb2761ce..803f20e8979 100644 --- a/test/units/module_utils/basic/test_exit_json.py +++ b/test/units/module_utils/basic/test_exit_json.py @@ -2,9 +2,7 @@ # Copyright (c) 2015-2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/units/module_utils/basic/test_filesystem.py b/test/units/module_utils/basic/test_filesystem.py index 50e674c4749..c08b493f70c 100644 --- a/test/units/module_utils/basic/test_filesystem.py +++ b/test/units/module_utils/basic/test_filesystem.py @@ -4,8 +4,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from units.mock.procenv import ModuleTestCase diff --git a/test/units/module_utils/basic/test_get_available_hash_algorithms.py b/test/units/module_utils/basic/test_get_available_hash_algorithms.py index d60f34cc8f5..d22efc8f745 100644 --- a/test/units/module_utils/basic/test_get_available_hash_algorithms.py +++ b/test/units/module_utils/basic/test_get_available_hash_algorithms.py @@ -1,8 +1,7 @@ """Unit tests to provide coverage not easily obtained from integration tests.""" -from __future__ import (absolute_import, division, print_function) +from __future__ import annotations -__metaclass__ = type import hashlib import sys diff --git a/test/units/module_utils/basic/test_get_file_attributes.py b/test/units/module_utils/basic/test_get_file_attributes.py index 836529cce06..df41af7c7f9 100644 --- a/test/units/module_utils/basic/test_get_file_attributes.py +++ b/test/units/module_utils/basic/test_get_file_attributes.py @@ -3,9 +3,7 @@ # (c) 2017, Pierre-Louis Bonicoli # License: GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from itertools import product diff --git a/test/units/module_utils/basic/test_get_module_path.py b/test/units/module_utils/basic/test_get_module_path.py index 6ff4a3bc712..864030c5fa5 100644 --- a/test/units/module_utils/basic/test_get_module_path.py +++ b/test/units/module_utils/basic/test_get_module_path.py @@ -4,8 +4,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from units.mock.procenv import ModuleTestCase diff --git a/test/units/module_utils/basic/test_heuristic_log_sanitize.py b/test/units/module_utils/basic/test_heuristic_log_sanitize.py index 664b8a5a848..debbda73d49 100644 --- a/test/units/module_utils/basic/test_heuristic_log_sanitize.py +++ b/test/units/module_utils/basic/test_heuristic_log_sanitize.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from ansible.module_utils.basic import heuristic_log_sanitize diff --git a/test/units/module_utils/basic/test_imports.py b/test/units/module_utils/basic/test_imports.py index 3c34de50745..93b357bb365 100644 --- a/test/units/module_utils/basic/test_imports.py +++ b/test/units/module_utils/basic/test_imports.py @@ -4,8 +4,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/units/module_utils/basic/test_log.py b/test/units/module_utils/basic/test_log.py index f3f764fc04f..bd0bfbe31cf 100644 --- a/test/units/module_utils/basic/test_log.py +++ b/test/units/module_utils/basic/test_log.py @@ -3,8 +3,7 @@ # (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import syslog from itertools import product diff --git a/test/units/module_utils/basic/test_no_log.py b/test/units/module_utils/basic/test_no_log.py index c4797028297..698c38eed6a 100644 --- a/test/units/module_utils/basic/test_no_log.py +++ b/test/units/module_utils/basic/test_no_log.py @@ -3,8 +3,7 @@ # (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from units.compat import unittest diff --git a/test/units/module_utils/basic/test_platform_distribution.py b/test/units/module_utils/basic/test_platform_distribution.py index 3c1afb7d85f..a9b623cece1 100644 --- a/test/units/module_utils/basic/test_platform_distribution.py +++ b/test/units/module_utils/basic/test_platform_distribution.py @@ -4,8 +4,7 @@ # (c) 2017-2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/basic/test_run_command.py b/test/units/module_utils/basic/test_run_command.py index 259ac6c4516..ecb68659520 100644 --- a/test/units/module_utils/basic/test_run_command.py +++ b/test/units/module_utils/basic/test_run_command.py @@ -2,9 +2,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import errno from itertools import product diff --git a/test/units/module_utils/basic/test_safe_eval.py b/test/units/module_utils/basic/test_safe_eval.py index fdaab18abfc..62403e81e6c 100644 --- a/test/units/module_utils/basic/test_safe_eval.py +++ b/test/units/module_utils/basic/test_safe_eval.py @@ -2,9 +2,7 @@ # (c) 2015-2017, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from itertools import chain import pytest diff --git a/test/units/module_utils/basic/test_sanitize_keys.py b/test/units/module_utils/basic/test_sanitize_keys.py index 3edb216b8b2..3b66f83057b 100644 --- a/test/units/module_utils/basic/test_sanitize_keys.py +++ b/test/units/module_utils/basic/test_sanitize_keys.py @@ -2,9 +2,7 @@ # (c) 2020, Red Hat # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.basic import sanitize_keys diff --git a/test/units/module_utils/basic/test_selinux.py b/test/units/module_utils/basic/test_selinux.py index bdb6b9dee4b..57598e20794 100644 --- a/test/units/module_utils/basic/test_selinux.py +++ b/test/units/module_utils/basic/test_selinux.py @@ -4,8 +4,7 @@ # (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import errno import json diff --git a/test/units/module_utils/basic/test_set_cwd.py b/test/units/module_utils/basic/test_set_cwd.py index c094c6226a1..4542b2eb91b 100644 --- a/test/units/module_utils/basic/test_set_cwd.py +++ b/test/units/module_utils/basic/test_set_cwd.py @@ -2,9 +2,7 @@ # Copyright (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/test/units/module_utils/basic/test_set_mode_if_different.py b/test/units/module_utils/basic/test_set_mode_if_different.py index 5fec331c2e9..8a21284c216 100644 --- a/test/units/module_utils/basic/test_set_mode_if_different.py +++ b/test/units/module_utils/basic/test_set_mode_if_different.py @@ -3,9 +3,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import errno import os diff --git a/test/units/module_utils/basic/test_tmpdir.py b/test/units/module_utils/basic/test_tmpdir.py index ec12508b6cd..3f51f56f492 100644 --- a/test/units/module_utils/basic/test_tmpdir.py +++ b/test/units/module_utils/basic/test_tmpdir.py @@ -2,9 +2,7 @@ # Copyright (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import os diff --git a/test/units/module_utils/common/arg_spec/test_aliases.py b/test/units/module_utils/common/arg_spec/test_aliases.py index 7522c769d79..a7c82b03b49 100644 --- a/test/units/module_utils/common/arg_spec/test_aliases.py +++ b/test/units/module_utils/common/arg_spec/test_aliases.py @@ -2,8 +2,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/arg_spec/test_module_validate.py b/test/units/module_utils/common/arg_spec/test_module_validate.py index 2c2211c9d41..e4af5a24e3d 100644 --- a/test/units/module_utils/common/arg_spec/test_module_validate.py +++ b/test/units/module_utils/common/arg_spec/test_module_validate.py @@ -2,8 +2,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common import warnings diff --git a/test/units/module_utils/common/arg_spec/test_sub_spec.py b/test/units/module_utils/common/arg_spec/test_sub_spec.py index a6e75754eb5..90b4c37b77f 100644 --- a/test/units/module_utils/common/arg_spec/test_sub_spec.py +++ b/test/units/module_utils/common/arg_spec/test_sub_spec.py @@ -2,8 +2,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.arg_spec import ArgumentSpecValidator, ValidationResult diff --git a/test/units/module_utils/common/arg_spec/test_validate_invalid.py b/test/units/module_utils/common/arg_spec/test_validate_invalid.py index 7302e8aad4e..5fcb61ab7f2 100644 --- a/test/units/module_utils/common/arg_spec/test_validate_invalid.py +++ b/test/units/module_utils/common/arg_spec/test_validate_invalid.py @@ -2,8 +2,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/arg_spec/test_validate_valid.py b/test/units/module_utils/common/arg_spec/test_validate_valid.py index 7e41127e69c..1cad3f1f882 100644 --- a/test/units/module_utils/common/arg_spec/test_validate_valid.py +++ b/test/units/module_utils/common/arg_spec/test_validate_valid.py @@ -2,8 +2,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/parameters/test_check_arguments.py b/test/units/module_utils/common/parameters/test_check_arguments.py index 53112179303..d7b72172c0f 100644 --- a/test/units/module_utils/common/parameters/test_check_arguments.py +++ b/test/units/module_utils/common/parameters/test_check_arguments.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/parameters/test_handle_aliases.py b/test/units/module_utils/common/parameters/test_handle_aliases.py index 6a8c2b2c5b0..550d10ff5c0 100644 --- a/test/units/module_utils/common/parameters/test_handle_aliases.py +++ b/test/units/module_utils/common/parameters/test_handle_aliases.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/parameters/test_list_deprecations.py b/test/units/module_utils/common/parameters/test_list_deprecations.py index d667a2f0bb3..90bed67b47d 100644 --- a/test/units/module_utils/common/parameters/test_list_deprecations.py +++ b/test/units/module_utils/common/parameters/test_list_deprecations.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.parameters import _list_deprecations diff --git a/test/units/module_utils/common/parameters/test_list_no_log_values.py b/test/units/module_utils/common/parameters/test_list_no_log_values.py index ac0e7353fd8..9cfcecf3219 100644 --- a/test/units/module_utils/common/parameters/test_list_no_log_values.py +++ b/test/units/module_utils/common/parameters/test_list_no_log_values.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/process/test_get_bin_path.py b/test/units/module_utils/common/process/test_get_bin_path.py index 7c0bd0a8db5..4be95a9525e 100644 --- a/test/units/module_utils/common/process/test_get_bin_path.py +++ b/test/units/module_utils/common/process/test_get_bin_path.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/test_collections.py b/test/units/module_utils/common/test_collections.py index 8424502e079..5485fdf6b91 100644 --- a/test/units/module_utils/common/test_collections.py +++ b/test/units/module_utils/common/test_collections.py @@ -3,8 +3,7 @@ # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) """Test low-level utility functions from ``module_utils.common.collections``.""" -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/test_dict_transformations.py b/test/units/module_utils/common/test_dict_transformations.py index ba55299c996..7e7c0d3d5cb 100644 --- a/test/units/module_utils/common/test_dict_transformations.py +++ b/test/units/module_utils/common/test_dict_transformations.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017, Will Thames # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/test_locale.py b/test/units/module_utils/common/test_locale.py index 9d9598601e8..25625bdc87a 100644 --- a/test/units/module_utils/common/test_locale.py +++ b/test/units/module_utils/common/test_locale.py @@ -2,8 +2,7 @@ # (c) Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from units.compat.mock import MagicMock diff --git a/test/units/module_utils/common/test_network.py b/test/units/module_utils/common/test_network.py index 27d95032a73..012693b407d 100644 --- a/test/units/module_utils/common/test_network.py +++ b/test/units/module_utils/common/test_network.py @@ -2,9 +2,7 @@ # (c) 2017 Red Hat, Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/test_sys_info.py b/test/units/module_utils/common/test_sys_info.py index 18aafe5374d..4dfc59ac21b 100644 --- a/test/units/module_utils/common/test_sys_info.py +++ b/test/units/module_utils/common/test_sys_info.py @@ -4,8 +4,7 @@ # (c) 2017-2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/test_utils.py b/test/units/module_utils/common/test_utils.py index ef952393a98..9fe56c924b4 100644 --- a/test/units/module_utils/common/test_utils.py +++ b/test/units/module_utils/common/test_utils.py @@ -2,8 +2,7 @@ # (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.sys_info import get_all_subclasses diff --git a/test/units/module_utils/common/text/converters/test_container_to_bytes.py b/test/units/module_utils/common/text/converters/test_container_to_bytes.py index 091545e3e71..64baaedc321 100644 --- a/test/units/module_utils/common/text/converters/test_container_to_bytes.py +++ b/test/units/module_utils/common/text/converters/test_container_to_bytes.py @@ -2,8 +2,7 @@ # Copyright 2019, Andrew Klychkov @Andersson007 # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/text/converters/test_container_to_text.py b/test/units/module_utils/common/text/converters/test_container_to_text.py index 39038f51333..4639f340d61 100644 --- a/test/units/module_utils/common/text/converters/test_container_to_text.py +++ b/test/units/module_utils/common/text/converters/test_container_to_text.py @@ -2,8 +2,7 @@ # Copyright 2019, Andrew Klychkov @Andersson007 # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/text/converters/test_json_encode_fallback.py b/test/units/module_utils/common/text/converters/test_json_encode_fallback.py index 808bf410247..bab6083311b 100644 --- a/test/units/module_utils/common/text/converters/test_json_encode_fallback.py +++ b/test/units/module_utils/common/text/converters/test_json_encode_fallback.py @@ -2,8 +2,7 @@ # Copyright 2019, Andrew Klychkov @Andersson007 # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/text/converters/test_jsonify.py b/test/units/module_utils/common/text/converters/test_jsonify.py index a34153133a9..76545b214ed 100644 --- a/test/units/module_utils/common/text/converters/test_jsonify.py +++ b/test/units/module_utils/common/text/converters/test_jsonify.py @@ -2,8 +2,7 @@ # Copyright 2019, Andrew Klychkov @Andersson007 # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/text/converters/test_to_str.py b/test/units/module_utils/common/text/converters/test_to_str.py index 712ed85bbbe..b3919cb4022 100644 --- a/test/units/module_utils/common/text/converters/test_to_str.py +++ b/test/units/module_utils/common/text/converters/test_to_str.py @@ -3,8 +3,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import itertools diff --git a/test/units/module_utils/common/text/formatters/test_bytes_to_human.py b/test/units/module_utils/common/text/formatters/test_bytes_to_human.py index 41475f56cf0..488c33a9b16 100644 --- a/test/units/module_utils/common/text/formatters/test_bytes_to_human.py +++ b/test/units/module_utils/common/text/formatters/test_bytes_to_human.py @@ -2,8 +2,7 @@ # Copyright 2019, Andrew Klychkov @Andersson007 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/text/formatters/test_human_to_bytes.py b/test/units/module_utils/common/text/formatters/test_human_to_bytes.py index d02699a656b..c0d7b005c4e 100644 --- a/test/units/module_utils/common/text/formatters/test_human_to_bytes.py +++ b/test/units/module_utils/common/text/formatters/test_human_to_bytes.py @@ -3,8 +3,7 @@ # Copyright 2019, Sviatoslav Sydorenko # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/text/formatters/test_lenient_lowercase.py b/test/units/module_utils/common/text/formatters/test_lenient_lowercase.py index 1ecc013e59b..99a60588e57 100644 --- a/test/units/module_utils/common/text/formatters/test_lenient_lowercase.py +++ b/test/units/module_utils/common/text/formatters/test_lenient_lowercase.py @@ -2,8 +2,7 @@ # Copyright 2019, Andrew Klychkov @Andersson007 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from datetime import datetime diff --git a/test/units/module_utils/common/validation/test_check_missing_parameters.py b/test/units/module_utils/common/validation/test_check_missing_parameters.py index 364f9439f43..490696bc54d 100644 --- a/test/units/module_utils/common/validation/test_check_missing_parameters.py +++ b/test/units/module_utils/common/validation/test_check_missing_parameters.py @@ -2,9 +2,8 @@ # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import pytest diff --git a/test/units/module_utils/common/validation/test_check_mutually_exclusive.py b/test/units/module_utils/common/validation/test_check_mutually_exclusive.py index acc67be8b11..dc0f0274050 100644 --- a/test/units/module_utils/common/validation/test_check_mutually_exclusive.py +++ b/test/units/module_utils/common/validation/test_check_mutually_exclusive.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_required_arguments.py b/test/units/module_utils/common/validation/test_check_required_arguments.py index eb3d52e2fc1..16e79fe7dc2 100644 --- a/test/units/module_utils/common/validation/test_check_required_arguments.py +++ b/test/units/module_utils/common/validation/test_check_required_arguments.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_required_by.py b/test/units/module_utils/common/validation/test_check_required_by.py index fcba0c14a66..053c30a1438 100644 --- a/test/units/module_utils/common/validation/test_check_required_by.py +++ b/test/units/module_utils/common/validation/test_check_required_by.py @@ -2,9 +2,8 @@ # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import pytest diff --git a/test/units/module_utils/common/validation/test_check_required_if.py b/test/units/module_utils/common/validation/test_check_required_if.py index 4590b05c42c..7934ad78bdd 100644 --- a/test/units/module_utils/common/validation/test_check_required_if.py +++ b/test/units/module_utils/common/validation/test_check_required_if.py @@ -2,9 +2,8 @@ # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import pytest diff --git a/test/units/module_utils/common/validation/test_check_required_one_of.py b/test/units/module_utils/common/validation/test_check_required_one_of.py index efdba537d95..d1877134b6f 100644 --- a/test/units/module_utils/common/validation/test_check_required_one_of.py +++ b/test/units/module_utils/common/validation/test_check_required_one_of.py @@ -2,9 +2,8 @@ # Copyright: (c) 2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import pytest diff --git a/test/units/module_utils/common/validation/test_check_required_together.py b/test/units/module_utils/common/validation/test_check_required_together.py index cf4626ab35e..475b491880c 100644 --- a/test/units/module_utils/common/validation/test_check_required_together.py +++ b/test/units/module_utils/common/validation/test_check_required_together.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_type_bits.py b/test/units/module_utils/common/validation/test_check_type_bits.py index aa91da94c09..fa9a60e520b 100644 --- a/test/units/module_utils/common/validation/test_check_type_bits.py +++ b/test/units/module_utils/common/validation/test_check_type_bits.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_type_bool.py b/test/units/module_utils/common/validation/test_check_type_bool.py index 00b785f68d6..32d65fe9a52 100644 --- a/test/units/module_utils/common/validation/test_check_type_bool.py +++ b/test/units/module_utils/common/validation/test_check_type_bool.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_type_bytes.py b/test/units/module_utils/common/validation/test_check_type_bytes.py index c29e42f88cd..5d43f7f3d13 100644 --- a/test/units/module_utils/common/validation/test_check_type_bytes.py +++ b/test/units/module_utils/common/validation/test_check_type_bytes.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_type_dict.py b/test/units/module_utils/common/validation/test_check_type_dict.py index 75638c587cd..665224e4efa 100644 --- a/test/units/module_utils/common/validation/test_check_type_dict.py +++ b/test/units/module_utils/common/validation/test_check_type_dict.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_type_float.py b/test/units/module_utils/common/validation/test_check_type_float.py index a0218875b56..d7e12e14459 100644 --- a/test/units/module_utils/common/validation/test_check_type_float.py +++ b/test/units/module_utils/common/validation/test_check_type_float.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_type_int.py b/test/units/module_utils/common/validation/test_check_type_int.py index 6f4dc6a2d5a..e9434826179 100644 --- a/test/units/module_utils/common/validation/test_check_type_int.py +++ b/test/units/module_utils/common/validation/test_check_type_int.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_type_jsonarg.py b/test/units/module_utils/common/validation/test_check_type_jsonarg.py index d43bb035bd9..2c229faf44a 100644 --- a/test/units/module_utils/common/validation/test_check_type_jsonarg.py +++ b/test/units/module_utils/common/validation/test_check_type_jsonarg.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_type_list.py b/test/units/module_utils/common/validation/test_check_type_list.py index 3f7a9ee6c1d..5e9a0cd2951 100644 --- a/test/units/module_utils/common/validation/test_check_type_list.py +++ b/test/units/module_utils/common/validation/test_check_type_list.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_check_type_path.py b/test/units/module_utils/common/validation/test_check_type_path.py index d6ff433aceb..e923c888441 100644 --- a/test/units/module_utils/common/validation/test_check_type_path.py +++ b/test/units/module_utils/common/validation/test_check_type_path.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import re diff --git a/test/units/module_utils/common/validation/test_check_type_raw.py b/test/units/module_utils/common/validation/test_check_type_raw.py index 988e5543e16..94ad7fc8c66 100644 --- a/test/units/module_utils/common/validation/test_check_type_raw.py +++ b/test/units/module_utils/common/validation/test_check_type_raw.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.validation import check_type_raw diff --git a/test/units/module_utils/common/validation/test_check_type_str.py b/test/units/module_utils/common/validation/test_check_type_str.py index 71af2a0ba4c..e8dbbe21538 100644 --- a/test/units/module_utils/common/validation/test_check_type_str.py +++ b/test/units/module_utils/common/validation/test_check_type_str.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/validation/test_count_terms.py b/test/units/module_utils/common/validation/test_count_terms.py index f41dc40d121..bf942660595 100644 --- a/test/units/module_utils/common/validation/test_count_terms.py +++ b/test/units/module_utils/common/validation/test_count_terms.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/warnings/test_deprecate.py b/test/units/module_utils/common/warnings/test_deprecate.py index 08c1b35858a..f91b7267815 100644 --- a/test/units/module_utils/common/warnings/test_deprecate.py +++ b/test/units/module_utils/common/warnings/test_deprecate.py @@ -2,8 +2,7 @@ # (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/common/warnings/test_warn.py b/test/units/module_utils/common/warnings/test_warn.py index 41e1a7b3397..85998b8419d 100644 --- a/test/units/module_utils/common/warnings/test_warn.py +++ b/test/units/module_utils/common/warnings/test_warn.py @@ -2,8 +2,7 @@ # (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/compat/test_datetime.py b/test/units/module_utils/compat/test_datetime.py index 66a0ad0ba76..4ee8eda8045 100644 --- a/test/units/module_utils/compat/test_datetime.py +++ b/test/units/module_utils/compat/test_datetime.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import datetime diff --git a/test/units/module_utils/conftest.py b/test/units/module_utils/conftest.py index 8e82bf2a67e..de4af0b3f4b 100644 --- a/test/units/module_utils/conftest.py +++ b/test/units/module_utils/conftest.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import sys diff --git a/test/units/module_utils/facts/base.py b/test/units/module_utils/facts/base.py index 3cada8f1295..f180ec65ba7 100644 --- a/test/units/module_utils/facts/base.py +++ b/test/units/module_utils/facts/base.py @@ -15,9 +15,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from units.compat.mock import Mock, patch diff --git a/test/units/module_utils/facts/hardware/aix_data.py b/test/units/module_utils/facts/hardware/aix_data.py index d1a6c9abcec..16563c9a010 100644 --- a/test/units/module_utils/facts/hardware/aix_data.py +++ b/test/units/module_utils/facts/hardware/aix_data.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations AIX_PROCESSOR_TEST_SCENARIOS = [ diff --git a/test/units/module_utils/facts/hardware/linux_data.py b/test/units/module_utils/facts/hardware/linux_data.py index f92f14ebf5d..1598e34f193 100644 --- a/test/units/module_utils/facts/hardware/linux_data.py +++ b/test/units/module_utils/facts/hardware/linux_data.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/module_utils/facts/hardware/test_aix_processor.py b/test/units/module_utils/facts/hardware/test_aix_processor.py index 94d9b9e0a5b..bf0b61bf75d 100644 --- a/test/units/module_utils/facts/hardware/test_aix_processor.py +++ b/test/units/module_utils/facts/hardware/test_aix_processor.py @@ -2,8 +2,7 @@ # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.hardware import aix import pytest diff --git a/test/units/module_utils/facts/hardware/test_linux.py b/test/units/module_utils/facts/hardware/test_linux.py index 4cf89c1469b..2745d9e535c 100644 --- a/test/units/module_utils/facts/hardware/test_linux.py +++ b/test/units/module_utils/facts/hardware/test_linux.py @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/module_utils/facts/hardware/test_linux_get_cpu_info.py b/test/units/module_utils/facts/hardware/test_linux_get_cpu_info.py index 4167434458b..e0d350b65e4 100644 --- a/test/units/module_utils/facts/hardware/test_linux_get_cpu_info.py +++ b/test/units/module_utils/facts/hardware/test_linux_get_cpu_info.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.hardware import linux diff --git a/test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py b/test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py index e14a2da8688..c49ac91c47c 100644 --- a/test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py +++ b/test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import time from ansible.module_utils.facts.hardware import sunos diff --git a/test/units/module_utils/facts/network/test_fc_wwn.py b/test/units/module_utils/facts/network/test_fc_wwn.py index 32a3a43d0a9..9a883710440 100644 --- a/test/units/module_utils/facts/network/test_fc_wwn.py +++ b/test/units/module_utils/facts/network/test_fc_wwn.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.network import fc_wwn from units.compat.mock import Mock diff --git a/test/units/module_utils/facts/network/test_generic_bsd.py b/test/units/module_utils/facts/network/test_generic_bsd.py index f061f04d8a9..d1e94714b67 100644 --- a/test/units/module_utils/facts/network/test_generic_bsd.py +++ b/test/units/module_utils/facts/network/test_generic_bsd.py @@ -14,9 +14,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat.mock import Mock from units.compat import unittest diff --git a/test/units/module_utils/facts/network/test_iscsi_get_initiator.py b/test/units/module_utils/facts/network/test_iscsi_get_initiator.py index 2048ba2a000..9e9eec7e9c6 100644 --- a/test/units/module_utils/facts/network/test_iscsi_get_initiator.py +++ b/test/units/module_utils/facts/network/test_iscsi_get_initiator.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.network import iscsi from units.compat.mock import Mock diff --git a/test/units/module_utils/facts/network/test_locally_reachable_ips.py b/test/units/module_utils/facts/network/test_locally_reachable_ips.py index 7eac790f16f..116d86e1ddd 100644 --- a/test/units/module_utils/facts/network/test_locally_reachable_ips.py +++ b/test/units/module_utils/facts/network/test_locally_reachable_ips.py @@ -16,9 +16,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat.mock import Mock from units.compat import unittest diff --git a/test/units/module_utils/facts/other/test_facter.py b/test/units/module_utils/facts/other/test_facter.py index 7466338eb5a..706bbaf99bf 100644 --- a/test/units/module_utils/facts/other/test_facter.py +++ b/test/units/module_utils/facts/other/test_facter.py @@ -15,9 +15,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat.mock import Mock, patch diff --git a/test/units/module_utils/facts/other/test_ohai.py b/test/units/module_utils/facts/other/test_ohai.py index 42a72d97200..0093166dff9 100644 --- a/test/units/module_utils/facts/other/test_ohai.py +++ b/test/units/module_utils/facts/other/test_ohai.py @@ -15,9 +15,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat.mock import Mock, patch diff --git a/test/units/module_utils/facts/system/distribution/conftest.py b/test/units/module_utils/facts/system/distribution/conftest.py index d27b97f07d2..580467bd4b6 100644 --- a/test/units/module_utils/facts/system/distribution/conftest.py +++ b/test/units/module_utils/facts/system/distribution/conftest.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/facts/system/distribution/test_distribution_sles4sap.py b/test/units/module_utils/facts/system/distribution/test_distribution_sles4sap.py index ab465eaec98..cc4978e654d 100644 --- a/test/units/module_utils/facts/system/distribution/test_distribution_sles4sap.py +++ b/test/units/module_utils/facts/system/distribution/test_distribution_sles4sap.py @@ -2,8 +2,7 @@ # Copyright: (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/facts/system/distribution/test_distribution_version.py b/test/units/module_utils/facts/system/distribution/test_distribution_version.py index a990274a6d3..eba5218c7d7 100644 --- a/test/units/module_utils/facts/system/distribution/test_distribution_version.py +++ b/test/units/module_utils/facts/system/distribution/test_distribution_version.py @@ -2,8 +2,7 @@ # Copyright: (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import glob import json diff --git a/test/units/module_utils/facts/system/distribution/test_parse_distribution_file_ClearLinux.py b/test/units/module_utils/facts/system/distribution/test_parse_distribution_file_ClearLinux.py index 6667ada7b00..fc30677079e 100644 --- a/test/units/module_utils/facts/system/distribution/test_parse_distribution_file_ClearLinux.py +++ b/test/units/module_utils/facts/system/distribution/test_parse_distribution_file_ClearLinux.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os import pytest diff --git a/test/units/module_utils/facts/system/distribution/test_parse_distribution_file_Slackware.py b/test/units/module_utils/facts/system/distribution/test_parse_distribution_file_Slackware.py index efb937e0767..d887172602f 100644 --- a/test/units/module_utils/facts/system/distribution/test_parse_distribution_file_Slackware.py +++ b/test/units/module_utils/facts/system/distribution/test_parse_distribution_file_Slackware.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os import pytest diff --git a/test/units/module_utils/facts/system/test_cmdline.py b/test/units/module_utils/facts/system/test_cmdline.py index 59cfd118cce..2cda884b2d0 100644 --- a/test/units/module_utils/facts/system/test_cmdline.py +++ b/test/units/module_utils/facts/system/test_cmdline.py @@ -3,8 +3,7 @@ # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest from ansible.module_utils.facts.system.cmdline import CmdLineFactCollector diff --git a/test/units/module_utils/facts/system/test_lsb.py b/test/units/module_utils/facts/system/test_lsb.py index e2ed2ec0eb1..4049aa08369 100644 --- a/test/units/module_utils/facts/system/test_lsb.py +++ b/test/units/module_utils/facts/system/test_lsb.py @@ -15,9 +15,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat.mock import Mock, patch diff --git a/test/units/module_utils/facts/system/test_pkg_mgr.py b/test/units/module_utils/facts/system/test_pkg_mgr.py index 8dc1a3b7756..bc7da5e4a98 100644 --- a/test/units/module_utils/facts/system/test_pkg_mgr.py +++ b/test/units/module_utils/facts/system/test_pkg_mgr.py @@ -2,8 +2,7 @@ # Copyright: (c) 2023, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.system.pkg_mgr import PkgMgrFactCollector diff --git a/test/units/module_utils/facts/system/test_user.py b/test/units/module_utils/facts/system/test_user.py index 5edfe146bc4..af9c09e3ea7 100644 --- a/test/units/module_utils/facts/system/test_user.py +++ b/test/units/module_utils/facts/system/test_user.py @@ -15,9 +15,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.system.user import UserFactCollector diff --git a/test/units/module_utils/facts/test_ansible_collector.py b/test/units/module_utils/facts/test_ansible_collector.py index 47d88df99e4..be44a670cfa 100644 --- a/test/units/module_utils/facts/test_ansible_collector.py +++ b/test/units/module_utils/facts/test_ansible_collector.py @@ -15,9 +15,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # for testing from units.compat import unittest diff --git a/test/units/module_utils/facts/test_collector.py b/test/units/module_utils/facts/test_collector.py index 4fc4bc5f72d..21e2400141f 100644 --- a/test/units/module_utils/facts/test_collector.py +++ b/test/units/module_utils/facts/test_collector.py @@ -16,9 +16,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections import defaultdict import pprint diff --git a/test/units/module_utils/facts/test_collectors.py b/test/units/module_utils/facts/test_collectors.py index 984b58599c7..a889a070089 100644 --- a/test/units/module_utils/facts/test_collectors.py +++ b/test/units/module_utils/facts/test_collectors.py @@ -15,9 +15,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/facts/test_date_time.py b/test/units/module_utils/facts/test_date_time.py index 6cc05f97a66..0a17d47df21 100644 --- a/test/units/module_utils/facts/test_date_time.py +++ b/test/units/module_utils/facts/test_date_time.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest import datetime diff --git a/test/units/module_utils/facts/test_facts.py b/test/units/module_utils/facts/test_facts.py index c794f031272..06cee74b5c7 100644 --- a/test/units/module_utils/facts/test_facts.py +++ b/test/units/module_utils/facts/test_facts.py @@ -16,9 +16,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/module_utils/facts/test_sysctl.py b/test/units/module_utils/facts/test_sysctl.py index 0f1632bf911..39c6a89d434 100644 --- a/test/units/module_utils/facts/test_sysctl.py +++ b/test/units/module_utils/facts/test_sysctl.py @@ -16,9 +16,7 @@ # along with Ansible. If not, see . # -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # for testing from units.compat import unittest diff --git a/test/units/module_utils/facts/test_timeout.py b/test/units/module_utils/facts/test_timeout.py index 6ba7c397d5c..d187cedf22c 100644 --- a/test/units/module_utils/facts/test_timeout.py +++ b/test/units/module_utils/facts/test_timeout.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys import time diff --git a/test/units/module_utils/facts/test_utils.py b/test/units/module_utils/facts/test_utils.py index 28cb5d31940..07921409c6e 100644 --- a/test/units/module_utils/facts/test_utils.py +++ b/test/units/module_utils/facts/test_utils.py @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from units.compat.mock import patch diff --git a/test/units/module_utils/facts/virtual/test_linux.py b/test/units/module_utils/facts/virtual/test_linux.py index 7c13299ebf6..b5d67e70edc 100644 --- a/test/units/module_utils/facts/virtual/test_linux.py +++ b/test/units/module_utils/facts/virtual/test_linux.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.facts.virtual import linux diff --git a/test/units/module_utils/json_utils/test_filter_non_json_lines.py b/test/units/module_utils/json_utils/test_filter_non_json_lines.py index b5b949997e5..9dad631f70f 100644 --- a/test/units/module_utils/json_utils/test_filter_non_json_lines.py +++ b/test/units/module_utils/json_utils/test_filter_non_json_lines.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from ansible.module_utils.json_utils import _filter_non_json_lines diff --git a/test/units/module_utils/parsing/test_convert_bool.py b/test/units/module_utils/parsing/test_convert_bool.py index 2c5f8121f5c..d0ade8bd085 100644 --- a/test/units/module_utils/parsing/test_convert_bool.py +++ b/test/units/module_utils/parsing/test_convert_bool.py @@ -2,9 +2,7 @@ # Copyright: (c) 2017 Ansible Project # License: GNU General Public License v3 or later (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt ) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/test_api.py b/test/units/module_utils/test_api.py index f7e768a8be5..c0d1defee65 100644 --- a/test/units/module_utils/test_api.py +++ b/test/units/module_utils/test_api.py @@ -3,8 +3,7 @@ # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.api import rate_limit, retry, retry_with_delays_and_condition diff --git a/test/units/module_utils/test_connection.py b/test/units/module_utils/test_connection.py index bd0285b3a72..fe7e99ce97d 100644 --- a/test/units/module_utils/test_connection.py +++ b/test/units/module_utils/test_connection.py @@ -2,8 +2,7 @@ # Copyright: (c) 2021, Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils import connection diff --git a/test/units/module_utils/test_distro.py b/test/units/module_utils/test_distro.py index bec127a2498..a0d3b431b1f 100644 --- a/test/units/module_utils/test_distro.py +++ b/test/units/module_utils/test_distro.py @@ -12,8 +12,7 @@ # Note that nir0s/distro has many more tests in it's test suite. The tests here are # primarily for testing the vendoring. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.module_utils import distro from ansible.module_utils.six import string_types diff --git a/test/units/module_utils/test_text.py b/test/units/module_utils/test_text.py index 72ef2ab269e..a32e2a98ff3 100644 --- a/test/units/module_utils/test_text.py +++ b/test/units/module_utils/test_text.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import codecs diff --git a/test/units/module_utils/urls/test_RedirectHandlerFactory.py b/test/units/module_utils/urls/test_RedirectHandlerFactory.py index 7bbe4b5b334..aeffdfd567f 100644 --- a/test/units/module_utils/urls/test_RedirectHandlerFactory.py +++ b/test/units/module_utils/urls/test_RedirectHandlerFactory.py @@ -2,8 +2,7 @@ # (c) 2018 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.urls import HAS_SSLCONTEXT, RedirectHandlerFactory, urllib_request, urllib_error diff --git a/test/units/module_utils/urls/test_Request.py b/test/units/module_utils/urls/test_Request.py index a8bc3a0b6bd..94987485d7f 100644 --- a/test/units/module_utils/urls/test_Request.py +++ b/test/units/module_utils/urls/test_Request.py @@ -2,8 +2,7 @@ # (c) 2018 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import datetime import os diff --git a/test/units/module_utils/urls/test_RequestWithMethod.py b/test/units/module_utils/urls/test_RequestWithMethod.py index 05105190229..ccebae693ec 100644 --- a/test/units/module_utils/urls/test_RequestWithMethod.py +++ b/test/units/module_utils/urls/test_RequestWithMethod.py @@ -2,8 +2,7 @@ # (c) 2018 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.urls import RequestWithMethod diff --git a/test/units/module_utils/urls/test_channel_binding.py b/test/units/module_utils/urls/test_channel_binding.py index a08e9e43c46..308fe369709 100644 --- a/test/units/module_utils/urls/test_channel_binding.py +++ b/test/units/module_utils/urls/test_channel_binding.py @@ -2,8 +2,7 @@ # (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import base64 import os.path diff --git a/test/units/module_utils/urls/test_fetch_file.py b/test/units/module_utils/urls/test_fetch_file.py index ecb6b9f15d7..6d6dc8cb547 100644 --- a/test/units/module_utils/urls/test_fetch_file.py +++ b/test/units/module_utils/urls/test_fetch_file.py @@ -2,8 +2,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/module_utils/urls/test_fetch_url.py b/test/units/module_utils/urls/test_fetch_url.py index 5bfd66af047..22ea63103a2 100644 --- a/test/units/module_utils/urls/test_fetch_url.py +++ b/test/units/module_utils/urls/test_fetch_url.py @@ -2,8 +2,7 @@ # (c) 2018 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import socket import sys diff --git a/test/units/module_utils/urls/test_generic_urlparse.py b/test/units/module_utils/urls/test_generic_urlparse.py index 7753726810a..49a6e062b4a 100644 --- a/test/units/module_utils/urls/test_generic_urlparse.py +++ b/test/units/module_utils/urls/test_generic_urlparse.py @@ -2,8 +2,7 @@ # (c) 2018 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.urls import generic_urlparse from ansible.module_utils.six.moves.urllib.parse import urlparse, urlunparse diff --git a/test/units/module_utils/urls/test_gzip.py b/test/units/module_utils/urls/test_gzip.py index c6840327708..644770ba490 100644 --- a/test/units/module_utils/urls/test_gzip.py +++ b/test/units/module_utils/urls/test_gzip.py @@ -2,8 +2,7 @@ # (c) 2021 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import gzip import io diff --git a/test/units/module_utils/urls/test_prepare_multipart.py b/test/units/module_utils/urls/test_prepare_multipart.py index ee320477e0a..5b81c39ce39 100644 --- a/test/units/module_utils/urls/test_prepare_multipart.py +++ b/test/units/module_utils/urls/test_prepare_multipart.py @@ -2,8 +2,7 @@ # (c) 2020 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/module_utils/urls/test_split.py b/test/units/module_utils/urls/test_split.py index 7fd5fc13cf8..99deb73d779 100644 --- a/test/units/module_utils/urls/test_split.py +++ b/test/units/module_utils/urls/test_split.py @@ -2,8 +2,7 @@ # Copyright: Contributors to the Ansible project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/module_utils/urls/test_urls.py b/test/units/module_utils/urls/test_urls.py index f0e5e9ea0ff..41d4c3ea96b 100644 --- a/test/units/module_utils/urls/test_urls.py +++ b/test/units/module_utils/urls/test_urls.py @@ -2,8 +2,7 @@ # (c) 2018 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils import urls from ansible.module_utils.common.text.converters import to_native diff --git a/test/units/modules/conftest.py b/test/units/modules/conftest.py index c60c586d93a..f94b236cdb5 100644 --- a/test/units/modules/conftest.py +++ b/test/units/modules/conftest.py @@ -1,8 +1,7 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/units/modules/test_apt.py b/test/units/modules/test_apt.py index a5aa4a90d7a..f6b8fec50a7 100644 --- a/test/units/modules/test_apt.py +++ b/test/units/modules/test_apt.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import collections diff --git a/test/units/modules/test_apt_key.py b/test/units/modules/test_apt_key.py index 37cd53b62d2..c14d1e612f9 100644 --- a/test/units/modules/test_apt_key.py +++ b/test/units/modules/test_apt_key.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/modules/test_async_wrapper.py b/test/units/modules/test_async_wrapper.py index dbaf6834cd4..1e3b02fc2e3 100644 --- a/test/units/modules/test_async_wrapper.py +++ b/test/units/modules/test_async_wrapper.py @@ -1,7 +1,6 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/modules/test_copy.py b/test/units/modules/test_copy.py index beeef6d72c2..49e332429a1 100644 --- a/test/units/modules/test_copy.py +++ b/test/units/modules/test_copy.py @@ -3,9 +3,7 @@ # (c) 2018 Ansible Project # License: GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/modules/test_hostname.py b/test/units/modules/test_hostname.py index 1aa4a57abeb..c34d22697e6 100644 --- a/test/units/modules/test_hostname.py +++ b/test/units/modules/test_hostname.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import shutil diff --git a/test/units/modules/test_iptables.py b/test/units/modules/test_iptables.py index 2459cf77863..6b1fa52aa70 100644 --- a/test/units/modules/test_iptables.py +++ b/test/units/modules/test_iptables.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat.mock import patch from ansible.module_utils import basic diff --git a/test/units/modules/test_known_hosts.py b/test/units/modules/test_known_hosts.py index 667f3e507f4..e2467559183 100644 --- a/test/units/modules/test_known_hosts.py +++ b/test/units/modules/test_known_hosts.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import tempfile diff --git a/test/units/modules/test_pip.py b/test/units/modules/test_pip.py index 5640b80582b..7ddee223fb8 100644 --- a/test/units/modules/test_pip.py +++ b/test/units/modules/test_pip.py @@ -1,7 +1,6 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/units/modules/test_service.py b/test/units/modules/test_service.py index caabd744232..9e711863168 100644 --- a/test/units/modules/test_service.py +++ b/test/units/modules/test_service.py @@ -2,9 +2,8 @@ # Copyright: (c) 2021, Abhijeet Kasurde # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type import json import platform diff --git a/test/units/modules/test_service_facts.py b/test/units/modules/test_service_facts.py index 07f6827e02f..fec5086fa54 100644 --- a/test/units/modules/test_service_facts.py +++ b/test/units/modules/test_service_facts.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from units.compat.mock import patch diff --git a/test/units/modules/test_systemd.py b/test/units/modules/test_systemd.py index 52c212a0ca5..ac7c1d0e602 100644 --- a/test/units/modules/test_systemd.py +++ b/test/units/modules/test_systemd.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from ansible.modules.systemd import parse_systemctl_show diff --git a/test/units/modules/test_unarchive.py b/test/units/modules/test_unarchive.py index 935231ba1d1..e66d0a184cc 100644 --- a/test/units/modules/test_unarchive.py +++ b/test/units/modules/test_unarchive.py @@ -1,6 +1,4 @@ -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/modules/test_yum.py b/test/units/modules/test_yum.py index 8052effa8a4..8723e14aced 100644 --- a/test/units/modules/test_yum.py +++ b/test/units/modules/test_yum.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest diff --git a/test/units/modules/utils.py b/test/units/modules/utils.py index b56229e81fa..5d1c025df7e 100644 --- a/test/units/modules/utils.py +++ b/test/units/modules/utils.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json diff --git a/test/units/parsing/test_ajson.py b/test/units/parsing/test_ajson.py index bb7bf1a70a7..6faf3f92dd9 100644 --- a/test/units/parsing/test_ajson.py +++ b/test/units/parsing/test_ajson.py @@ -2,8 +2,7 @@ # Copyright 2019, Andrew Klychkov @Andersson007 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import os import json diff --git a/test/units/parsing/test_dataloader.py b/test/units/parsing/test_dataloader.py index a7f8b1d24bf..62c2d346166 100644 --- a/test/units/parsing/test_dataloader.py +++ b/test/units/parsing/test_dataloader.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/parsing/test_mod_args.py b/test/units/parsing/test_mod_args.py index aeb74ad524c..0bb0c954da8 100644 --- a/test/units/parsing/test_mod_args.py +++ b/test/units/parsing/test_mod_args.py @@ -2,8 +2,7 @@ # Copyright 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/parsing/test_splitter.py b/test/units/parsing/test_splitter.py index 893f04737a7..9eb957d6969 100644 --- a/test/units/parsing/test_splitter.py +++ b/test/units/parsing/test_splitter.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.parsing.splitter import split_args, parse_kv from ansible.errors import AnsibleParserError diff --git a/test/units/parsing/test_unquote.py b/test/units/parsing/test_unquote.py index 4b4260e7bad..9d8918ae8ee 100644 --- a/test/units/parsing/test_unquote.py +++ b/test/units/parsing/test_unquote.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.parsing.quoting import unquote diff --git a/test/units/parsing/utils/test_addresses.py b/test/units/parsing/utils/test_addresses.py index 4f7304f553c..7562940dd88 100644 --- a/test/units/parsing/utils/test_addresses.py +++ b/test/units/parsing/utils/test_addresses.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import unittest diff --git a/test/units/parsing/utils/test_jsonify.py b/test/units/parsing/utils/test_jsonify.py index 37be7824e77..55b0c91044f 100644 --- a/test/units/parsing/utils/test_jsonify.py +++ b/test/units/parsing/utils/test_jsonify.py @@ -16,8 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from ansible.parsing.utils.jsonify import jsonify diff --git a/test/units/parsing/utils/test_yaml.py b/test/units/parsing/utils/test_yaml.py index 27b2905ac32..64d43c39691 100644 --- a/test/units/parsing/utils/test_yaml.py +++ b/test/units/parsing/utils/test_yaml.py @@ -16,8 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/parsing/vault/test_vault.py b/test/units/parsing/vault/test_vault.py index f94171a2280..2a64e675f38 100644 --- a/test/units/parsing/vault/test_vault.py +++ b/test/units/parsing/vault/test_vault.py @@ -17,9 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import io import os diff --git a/test/units/parsing/vault/test_vault_editor.py b/test/units/parsing/vault/test_vault_editor.py index 28561c6a54c..959582d890c 100644 --- a/test/units/parsing/vault/test_vault_editor.py +++ b/test/units/parsing/vault/test_vault_editor.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import tempfile diff --git a/test/units/parsing/yaml/test_constructor.py b/test/units/parsing/yaml/test_constructor.py index 717bf3543e0..7e16d17d966 100644 --- a/test/units/parsing/yaml/test_constructor.py +++ b/test/units/parsing/yaml/test_constructor.py @@ -2,8 +2,7 @@ # (c) 2020 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest from yaml import MappingNode, Mark, ScalarNode diff --git a/test/units/parsing/yaml/test_dumper.py b/test/units/parsing/yaml/test_dumper.py index 72582fed397..84fab1e4deb 100644 --- a/test/units/parsing/yaml/test_dumper.py +++ b/test/units/parsing/yaml/test_dumper.py @@ -14,9 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import io diff --git a/test/units/parsing/yaml/test_loader.py b/test/units/parsing/yaml/test_loader.py index 117f80a7d71..b63e1a69d11 100644 --- a/test/units/parsing/yaml/test_loader.py +++ b/test/units/parsing/yaml/test_loader.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import Sequence, Set, Mapping from io import StringIO diff --git a/test/units/parsing/yaml/test_objects.py b/test/units/parsing/yaml/test_objects.py index f899915da23..ca041aedc96 100644 --- a/test/units/parsing/yaml/test_objects.py +++ b/test/units/parsing/yaml/test_objects.py @@ -16,9 +16,7 @@ # # Copyright 2016, Adrian Likins -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest diff --git a/test/units/playbook/role/test_include_role.py b/test/units/playbook/role/test_include_role.py index aa97da15d46..cce119589a6 100644 --- a/test/units/playbook/role/test_include_role.py +++ b/test/units/playbook/role/test_include_role.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from unittest.mock import patch diff --git a/test/units/playbook/role/test_role.py b/test/units/playbook/role/test_role.py index 9d6b0edc1fc..0fe1c35df98 100644 --- a/test/units/playbook/role/test_role.py +++ b/test/units/playbook/role/test_role.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections.abc import Container diff --git a/test/units/playbook/test_attribute.py b/test/units/playbook/test_attribute.py index bdb37c11cd6..c246e9a15df 100644 --- a/test/units/playbook/test_attribute.py +++ b/test/units/playbook/test_attribute.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from ansible.playbook.attribute import Attribute diff --git a/test/units/playbook/test_base.py b/test/units/playbook/test_base.py index bedd96a8443..7750063d017 100644 --- a/test/units/playbook/test_base.py +++ b/test/units/playbook/test_base.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest diff --git a/test/units/playbook/test_block.py b/test/units/playbook/test_block.py index 48471237930..82179f30f0e 100644 --- a/test/units/playbook/test_block.py +++ b/test/units/playbook/test_block.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from ansible.playbook.block import Block diff --git a/test/units/playbook/test_collectionsearch.py b/test/units/playbook/test_collectionsearch.py index d16541b794a..f91d632363f 100644 --- a/test/units/playbook/test_collectionsearch.py +++ b/test/units/playbook/test_collectionsearch.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleParserError from ansible.playbook.play import Play diff --git a/test/units/playbook/test_conditional.py b/test/units/playbook/test_conditional.py index 8231d16c6ff..501c40b1c63 100644 --- a/test/units/playbook/test_conditional.py +++ b/test/units/playbook/test_conditional.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from units.mock.loader import DictDataLoader diff --git a/test/units/playbook/test_helpers.py b/test/units/playbook/test_helpers.py index 23385c00ef1..5fd6a6ee305 100644 --- a/test/units/playbook/test_helpers.py +++ b/test/units/playbook/test_helpers.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/playbook/test_included_file.py b/test/units/playbook/test_included_file.py index c7a66b06dc5..cbefe2f7c02 100644 --- a/test/units/playbook/test_included_file.py +++ b/test/units/playbook/test_included_file.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/playbook/test_play.py b/test/units/playbook/test_play.py index bcc1e5ead83..a54b93d1593 100644 --- a/test/units/playbook/test_play.py +++ b/test/units/playbook/test_play.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/playbook/test_play_context.py b/test/units/playbook/test_play_context.py index 7461b45ffbc..485a0e53789 100644 --- a/test/units/playbook/test_play_context.py +++ b/test/units/playbook/test_play_context.py @@ -3,9 +3,7 @@ # # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/playbook/test_playbook.py b/test/units/playbook/test_playbook.py index 68a9fb75832..efe6900a7ee 100644 --- a/test/units/playbook/test_playbook.py +++ b/test/units/playbook/test_playbook.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from ansible.errors import AnsibleParserError diff --git a/test/units/playbook/test_taggable.py b/test/units/playbook/test_taggable.py index c6ce35d3f0f..c0557b3f719 100644 --- a/test/units/playbook/test_taggable.py +++ b/test/units/playbook/test_taggable.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from ansible.playbook.taggable import Taggable diff --git a/test/units/playbook/test_task.py b/test/units/playbook/test_task.py index e28d2ecdfa8..72a4d639a00 100644 --- a/test/units/playbook/test_task.py +++ b/test/units/playbook/test_task.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from unittest.mock import patch diff --git a/test/units/plugins/action/test_action.py b/test/units/plugins/action/test_action.py index 33d09c4251d..51e28725db9 100644 --- a/test/units/plugins/action/test_action.py +++ b/test/units/plugins/action/test_action.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import re diff --git a/test/units/plugins/action/test_gather_facts.py b/test/units/plugins/action/test_gather_facts.py index 20225aa9588..44e55d3f348 100644 --- a/test/units/plugins/action/test_gather_facts.py +++ b/test/units/plugins/action/test_gather_facts.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from unittest.mock import MagicMock, patch diff --git a/test/units/plugins/action/test_raw.py b/test/units/plugins/action/test_raw.py index c50004a7217..488bae81555 100644 --- a/test/units/plugins/action/test_raw.py +++ b/test/units/plugins/action/test_raw.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/plugins/action/test_reboot.py b/test/units/plugins/action/test_reboot.py index 36d9e12d0f5..07e2694c5eb 100644 --- a/test/units/plugins/action/test_reboot.py +++ b/test/units/plugins/action/test_reboot.py @@ -1,6 +1,8 @@ # Copyright (c) 2022 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Tests for the reboot action plugin.""" +from __future__ import annotations + import os import pytest diff --git a/test/units/plugins/become/conftest.py b/test/units/plugins/become/conftest.py index a04a5e2da94..ce47dda7d71 100644 --- a/test/units/plugins/become/conftest.py +++ b/test/units/plugins/become/conftest.py @@ -3,9 +3,7 @@ # # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/plugins/become/test_su.py b/test/units/plugins/become/test_su.py index bf74a4c3e12..a6906375bd0 100644 --- a/test/units/plugins/become/test_su.py +++ b/test/units/plugins/become/test_su.py @@ -3,9 +3,7 @@ # # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/test/units/plugins/become/test_sudo.py b/test/units/plugins/become/test_sudo.py index 67eb9a46b42..6b7ca137142 100644 --- a/test/units/plugins/become/test_sudo.py +++ b/test/units/plugins/become/test_sudo.py @@ -3,9 +3,7 @@ # # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re diff --git a/test/units/plugins/cache/test_cache.py b/test/units/plugins/cache/test_cache.py index b4ffe4e3799..025be992548 100644 --- a/test/units/plugins/cache/test_cache.py +++ b/test/units/plugins/cache/test_cache.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import shutil diff --git a/test/units/plugins/callback/test_callback.py b/test/units/plugins/callback/test_callback.py index ccfa4658e54..cab1e935d44 100644 --- a/test/units/plugins/callback/test_callback.py +++ b/test/units/plugins/callback/test_callback.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import json import re diff --git a/test/units/plugins/connection/test_connection.py b/test/units/plugins/connection/test_connection.py index 56095c60b9e..65e6f988c97 100644 --- a/test/units/plugins/connection/test_connection.py +++ b/test/units/plugins/connection/test_connection.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from io import StringIO diff --git a/test/units/plugins/connection/test_local.py b/test/units/plugins/connection/test_local.py index 483a881b2ed..57e6f7f0373 100644 --- a/test/units/plugins/connection/test_local.py +++ b/test/units/plugins/connection/test_local.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from io import StringIO diff --git a/test/units/plugins/connection/test_paramiko_ssh.py b/test/units/plugins/connection/test_paramiko_ssh.py index 0307261354f..708ae746115 100644 --- a/test/units/plugins/connection/test_paramiko_ssh.py +++ b/test/units/plugins/connection/test_paramiko_ssh.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from io import StringIO import pytest diff --git a/test/units/plugins/connection/test_psrp.py b/test/units/plugins/connection/test_psrp.py index 38052e81d38..7fd6eadd62b 100644 --- a/test/units/plugins/connection/test_psrp.py +++ b/test/units/plugins/connection/test_psrp.py @@ -2,9 +2,7 @@ # (c) 2018, Jordan Borean # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest import sys diff --git a/test/units/plugins/connection/test_ssh.py b/test/units/plugins/connection/test_ssh.py index 48ad3b73312..ff1f128bafe 100644 --- a/test/units/plugins/connection/test_ssh.py +++ b/test/units/plugins/connection/test_ssh.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from io import StringIO import pytest diff --git a/test/units/plugins/connection/test_winrm.py b/test/units/plugins/connection/test_winrm.py index 0a19850bc1a..eeff70e5786 100644 --- a/test/units/plugins/connection/test_winrm.py +++ b/test/units/plugins/connection/test_winrm.py @@ -2,9 +2,7 @@ # (c) 2018, Jordan Borean # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/plugins/filter/test_core.py b/test/units/plugins/filter/test_core.py index ab09ec43967..6c25d15dd95 100644 --- a/test/units/plugins/filter/test_core.py +++ b/test/units/plugins/filter/test_core.py @@ -2,8 +2,7 @@ # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/plugins/inventory/test_constructed.py b/test/units/plugins/inventory/test_constructed.py index 8ae78f1d100..cd91691a5d2 100644 --- a/test/units/plugins/inventory/test_constructed.py +++ b/test/units/plugins/inventory/test_constructed.py @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/plugins/inventory/test_inventory.py b/test/units/plugins/inventory/test_inventory.py index fb5342afbdb..76ab91f8819 100644 --- a/test/units/plugins/inventory/test_inventory.py +++ b/test/units/plugins/inventory/test_inventory.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import string import textwrap diff --git a/test/units/plugins/inventory/test_script.py b/test/units/plugins/inventory/test_script.py index 89eb4f5b5d0..952af27b3c5 100644 --- a/test/units/plugins/inventory/test_script.py +++ b/test/units/plugins/inventory/test_script.py @@ -17,9 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest from unittest import mock diff --git a/test/units/plugins/loader_fixtures/import_fixture.py b/test/units/plugins/loader_fixtures/import_fixture.py index 81127332e0b..46af1f2c26f 100644 --- a/test/units/plugins/loader_fixtures/import_fixture.py +++ b/test/units/plugins/loader_fixtures/import_fixture.py @@ -1,7 +1,6 @@ # Nothing to see here, this file is just empty to support a imp.load_source # without doing anything -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations class test: diff --git a/test/units/plugins/lookup/test_env.py b/test/units/plugins/lookup/test_env.py index 5d9713fe9cf..bc5e15cc34c 100644 --- a/test/units/plugins/lookup/test_env.py +++ b/test/units/plugins/lookup/test_env.py @@ -2,9 +2,7 @@ # Copyright: (c) 2019, Abhay Kadam # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/plugins/lookup/test_ini.py b/test/units/plugins/lookup/test_ini.py index b2d883cf364..21f45aa3bc8 100644 --- a/test/units/plugins/lookup/test_ini.py +++ b/test/units/plugins/lookup/test_ini.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest from ansible.plugins.lookup.ini import _parse_params diff --git a/test/units/plugins/lookup/test_password.py b/test/units/plugins/lookup/test_password.py index 685f2ce7554..a3075622732 100644 --- a/test/units/plugins/lookup/test_password.py +++ b/test/units/plugins/lookup/test_password.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations try: import passlib diff --git a/test/units/plugins/lookup/test_url.py b/test/units/plugins/lookup/test_url.py index 2aa77b30b71..2c88a053549 100644 --- a/test/units/plugins/lookup/test_url.py +++ b/test/units/plugins/lookup/test_url.py @@ -2,8 +2,7 @@ # Copyright: (c) 2020, Sam Doran # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/plugins/shell/test_cmd.py b/test/units/plugins/shell/test_cmd.py index 4c1a654b73d..fe75d9dbc83 100644 --- a/test/units/plugins/shell/test_cmd.py +++ b/test/units/plugins/shell/test_cmd.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/plugins/shell/test_powershell.py b/test/units/plugins/shell/test_powershell.py index c94baabbc7c..90ee00859d1 100644 --- a/test/units/plugins/shell/test_powershell.py +++ b/test/units/plugins/shell/test_powershell.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.plugins.shell.powershell import _parse_clixml, ShellModule diff --git a/test/units/plugins/strategy/test_linear.py b/test/units/plugins/strategy/test_linear.py index b39c142ad1b..8f1a11675b2 100644 --- a/test/units/plugins/strategy/test_linear.py +++ b/test/units/plugins/strategy/test_linear.py @@ -1,9 +1,7 @@ # Copyright (c) 2018 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest diff --git a/test/units/plugins/test_plugins.py b/test/units/plugins/test_plugins.py index ba2ad2b6432..d2791726a27 100644 --- a/test/units/plugins/test_plugins.py +++ b/test/units/plugins/test_plugins.py @@ -16,9 +16,7 @@ # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os diff --git a/test/units/regex/test_invalid_var_names.py b/test/units/regex/test_invalid_var_names.py index d47e68d3e59..5d6a8a7fdef 100644 --- a/test/units/regex/test_invalid_var_names.py +++ b/test/units/regex/test_invalid_var_names.py @@ -1,6 +1,4 @@ -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from units.compat import unittest diff --git a/test/units/template/test_native_concat.py b/test/units/template/test_native_concat.py index ee1b7df1ea5..5b41dbc50d8 100644 --- a/test/units/template/test_native_concat.py +++ b/test/units/template/test_native_concat.py @@ -1,9 +1,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.playbook.conditional import Conditional from ansible.template import Templar diff --git a/test/units/template/test_templar.py b/test/units/template/test_templar.py index 02840e16fdb..81f605dc410 100644 --- a/test/units/template/test_templar.py +++ b/test/units/template/test_templar.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from jinja2.runtime import Context diff --git a/test/units/template/test_template_utilities.py b/test/units/template/test_template_utilities.py index 1044895f03d..fa2335771fb 100644 --- a/test/units/template/test_template_utilities.py +++ b/test/units/template/test_template_utilities.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import jinja2 from units.compat import unittest diff --git a/test/units/template/test_vars.py b/test/units/template/test_vars.py index f43cfac462d..9547d1ea1e5 100644 --- a/test/units/template/test_vars.py +++ b/test/units/template/test_vars.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.template import Templar from ansible.template.vars import AnsibleJ2Vars diff --git a/test/units/test_context.py b/test/units/test_context.py index 24e2376dba4..545b15166b8 100644 --- a/test/units/test_context.py +++ b/test/units/test_context.py @@ -2,9 +2,7 @@ # Copyright: (c) 2018, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible import context diff --git a/test/units/test_no_tty.py b/test/units/test_no_tty.py index 290c0b922ab..1103ff08cec 100644 --- a/test/units/test_no_tty.py +++ b/test/units/test_no_tty.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import sys diff --git a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/ansible/builtin/plugins/modules/shouldnotload.py b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/ansible/builtin/plugins/modules/shouldnotload.py index 4041a338ba8..5d0cc08ff1a 100644 --- a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/ansible/builtin/plugins/modules/shouldnotload.py +++ b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/ansible/builtin/plugins/modules/shouldnotload.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations raise Exception('this module should never be loaded') diff --git a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/action/my_action.py b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/action/my_action.py index a85f422ab9a..87acaefa775 100644 --- a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/action/my_action.py +++ b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/action/my_action.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ..module_utils.my_util import question # pylint: disable=unused-import diff --git a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_other_util.py b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_other_util.py index 463b1334491..ddb7e473b88 100644 --- a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_other_util.py +++ b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_other_util.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from .my_util import question # pylint: disable=unused-import diff --git a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_util.py b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_util.py index c431c34ca40..65c00b85daf 100644 --- a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_util.py +++ b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_util.py @@ -1,5 +1,5 @@ # WARNING: Changing line numbers of code in this file will break collection tests that use tracing to check paths and line numbers. -# Also, do not import division from __future__ as this will break detection of __future__ inheritance on Python 2. +from __future__ import annotations def question(): diff --git a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/modules/__init__.py b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/modules/__init__.py index 6d697034538..1734ce3f2f4 100644 --- a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/modules/__init__.py +++ b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/modules/__init__.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations raise Exception('this should never run') diff --git a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/modules/amodule.py b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/modules/amodule.py index 99320a0c371..d5a6407f79e 100644 --- a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/modules/amodule.py +++ b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/modules/amodule.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def module_code(): diff --git a/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/__init__.py b/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/__init__.py index 6068ac1a2b9..efcfba7b39e 100644 --- a/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/__init__.py +++ b/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/__init__.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations raise Exception('this code should never execute') diff --git a/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/ansible/__init__.py b/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/ansible/__init__.py index 6068ac1a2b9..efcfba7b39e 100644 --- a/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/ansible/__init__.py +++ b/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/ansible/__init__.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations raise Exception('this code should never execute') diff --git a/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/__init__.py b/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/__init__.py index 6068ac1a2b9..efcfba7b39e 100644 --- a/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/__init__.py +++ b/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/__init__.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations raise Exception('this code should never execute') diff --git a/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/testcoll/__init__.py b/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/testcoll/__init__.py index 6068ac1a2b9..efcfba7b39e 100644 --- a/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/testcoll/__init__.py +++ b/test/units/utils/collection_loader/fixtures/collections_masked/ansible_collections/testns/testcoll/__init__.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations raise Exception('this code should never execute') diff --git a/test/units/utils/collection_loader/test_collection_loader.py b/test/units/utils/collection_loader/test_collection_loader.py index feaaf97a9c8..4fe4f437e22 100644 --- a/test/units/utils/collection_loader/test_collection_loader.py +++ b/test/units/utils/collection_loader/test_collection_loader.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import pkgutil diff --git a/test/units/utils/display/test_broken_cowsay.py b/test/units/utils/display/test_broken_cowsay.py index 96157e1a8b1..854b78b89e3 100644 --- a/test/units/utils/display/test_broken_cowsay.py +++ b/test/units/utils/display/test_broken_cowsay.py @@ -2,9 +2,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function - -__metaclass__ = type +from __future__ import annotations from ansible.utils.display import Display diff --git a/test/units/utils/display/test_curses.py b/test/units/utils/display/test_curses.py index 05efc41b1da..6816b715ee3 100644 --- a/test/units/utils/display/test_curses.py +++ b/test/units/utils/display/test_curses.py @@ -2,8 +2,7 @@ # Copyright (c) 2021 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import curses import importlib diff --git a/test/units/utils/display/test_display.py b/test/units/utils/display/test_display.py index cdeb496689b..af5f6597d00 100644 --- a/test/units/utils/display/test_display.py +++ b/test/units/utils/display/test_display.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.utils.display import Display diff --git a/test/units/utils/display/test_logger.py b/test/units/utils/display/test_logger.py index ed69393bdf7..8767affba3b 100644 --- a/test/units/utils/display/test_logger.py +++ b/test/units/utils/display/test_logger.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import logging diff --git a/test/units/utils/display/test_warning.py b/test/units/utils/display/test_warning.py index be63c348bca..32870fa8837 100644 --- a/test/units/utils/display/test_warning.py +++ b/test/units/utils/display/test_warning.py @@ -2,8 +2,7 @@ # Copyright (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/utils/test_cleanup_tmp_file.py b/test/units/utils/test_cleanup_tmp_file.py index 35374f4da70..213961dde9e 100644 --- a/test/units/utils/test_cleanup_tmp_file.py +++ b/test/units/utils/test_cleanup_tmp_file.py @@ -2,8 +2,7 @@ # Copyright: (c) 2019, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os import tempfile diff --git a/test/units/utils/test_context_objects.py b/test/units/utils/test_context_objects.py index c56a41d012a..eb6bfa952f9 100644 --- a/test/units/utils/test_context_objects.py +++ b/test/units/utils/test_context_objects.py @@ -2,8 +2,7 @@ # Copyright: (c) 2018, Toshio Kuratomi # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import argparse diff --git a/test/units/utils/test_display.py b/test/units/utils/test_display.py index 80b7a099c86..ae7b16bb12b 100644 --- a/test/units/utils/test_display.py +++ b/test/units/utils/test_display.py @@ -2,8 +2,7 @@ # (c) 2020 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import locale import sys diff --git a/test/units/utils/test_encrypt.py b/test/units/utils/test_encrypt.py index be325790194..a5a89450b91 100644 --- a/test/units/utils/test_encrypt.py +++ b/test/units/utils/test_encrypt.py @@ -1,8 +1,7 @@ # (c) 2018, Matthias Fuchs # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import sys diff --git a/test/units/utils/test_helpers.py b/test/units/utils/test_helpers.py index ec37b39bd09..75e42c36b8c 100644 --- a/test/units/utils/test_helpers.py +++ b/test/units/utils/test_helpers.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import unittest diff --git a/test/units/utils/test_isidentifier.py b/test/units/utils/test_isidentifier.py index de6de642ab0..e4b2a40b277 100644 --- a/test/units/utils/test_isidentifier.py +++ b/test/units/utils/test_isidentifier.py @@ -2,9 +2,7 @@ # Copyright: (c) 2020 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import pytest diff --git a/test/units/utils/test_plugin_docs.py b/test/units/utils/test_plugin_docs.py index ff973b1e264..46b41c52510 100644 --- a/test/units/utils/test_plugin_docs.py +++ b/test/units/utils/test_plugin_docs.py @@ -2,8 +2,7 @@ # (c) 2020 Felix Fontein # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations import copy diff --git a/test/units/utils/test_shlex.py b/test/units/utils/test_shlex.py index e13d302d0de..97a69c6f8aa 100644 --- a/test/units/utils/test_shlex.py +++ b/test/units/utils/test_shlex.py @@ -15,8 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import unittest diff --git a/test/units/utils/test_unsafe_proxy.py b/test/units/utils/test_unsafe_proxy.py index fbb0bcdc5fa..db853a760d5 100644 --- a/test/units/utils/test_unsafe_proxy.py +++ b/test/units/utils/test_unsafe_proxy.py @@ -2,8 +2,7 @@ # (c) 2018 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.utils.unsafe_proxy import AnsibleUnsafe, AnsibleUnsafeBytes, AnsibleUnsafeText, wrap_var from ansible.module_utils.common.text.converters import to_text, to_bytes diff --git a/test/units/utils/test_vars.py b/test/units/utils/test_vars.py index 727e04c86f1..2a0f9d1dbb8 100644 --- a/test/units/utils/test_vars.py +++ b/test/units/utils/test_vars.py @@ -16,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from collections import defaultdict diff --git a/test/units/utils/test_version.py b/test/units/utils/test_version.py index 3c2cbaf4c14..715076a5c44 100644 --- a/test/units/utils/test_version.py +++ b/test/units/utils/test_version.py @@ -2,8 +2,7 @@ # (c) 2020 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.compat.version import LooseVersion, StrictVersion diff --git a/test/units/vars/test_module_response_deepcopy.py b/test/units/vars/test_module_response_deepcopy.py index 3313dea1dc6..d484da0643c 100644 --- a/test/units/vars/test_module_response_deepcopy.py +++ b/test/units/vars/test_module_response_deepcopy.py @@ -2,8 +2,7 @@ # (c) 2018 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.vars.clean import module_response_deepcopy diff --git a/test/units/vars/test_variable_manager.py b/test/units/vars/test_variable_manager.py index ee6de817b16..c2649539fc6 100644 --- a/test/units/vars/test_variable_manager.py +++ b/test/units/vars/test_variable_manager.py @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import os