From f862113456cc40d8a1f0187ca4dc53548513e590 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 9 Oct 2025 23:42:38 +0200 Subject: [PATCH] Remove __metaclass__ = type. for i in $(grep -REl '__metaclass__ = type' plugins/ tests/); do sed -e '/^__metaclass__ = type/d' -i $i; done --- plugins/plugin_utils/_common.py | 4 ---- plugins/plugin_utils/_socket_handler.py | 4 ---- .../targets/docker_container/filter_plugins/ipaddr_tools.py | 1 - .../generic_connection_tests/filter_plugins/filter_attr.py | 1 - tests/unit/plugins/connection/test_docker.py | 3 --- tests/unit/plugins/inventory/test_docker_containers.py | 4 ---- tests/unit/plugins/module_utils/_api/api/test_client.py | 3 --- tests/unit/plugins/module_utils/_api/constants.py | 2 -- tests/unit/plugins/module_utils/_api/fake_api.py | 3 --- tests/unit/plugins/module_utils/_api/fake_stat.py | 2 -- tests/unit/plugins/module_utils/_api/test_auth.py | 3 --- tests/unit/plugins/module_utils/_api/test_context.py | 3 --- tests/unit/plugins/module_utils/_api/test_errors.py | 3 --- .../unit/plugins/module_utils/_api/transport/test_sshconn.py | 3 --- .../plugins/module_utils/_api/transport/test_ssladapter.py | 3 --- tests/unit/plugins/module_utils/_api/utils/test_build.py | 3 --- tests/unit/plugins/module_utils/_api/utils/test_config.py | 3 --- tests/unit/plugins/module_utils/_api/utils/test_decorators.py | 3 --- .../unit/plugins/module_utils/_api/utils/test_json_stream.py | 3 --- tests/unit/plugins/module_utils/_api/utils/test_ports.py | 3 --- tests/unit/plugins/module_utils/_api/utils/test_proxy.py | 3 --- tests/unit/plugins/module_utils/_api/utils/test_utils.py | 3 --- tests/unit/plugins/module_utils/compose_v2_test_cases.py | 3 --- tests/unit/plugins/module_utils/test__compose_v2.py | 3 --- tests/unit/plugins/module_utils/test__copy.py | 3 --- tests/unit/plugins/module_utils/test__image_archive.py | 3 --- tests/unit/plugins/module_utils/test__logfmt.py | 3 --- tests/unit/plugins/module_utils/test__scramble.py | 3 --- tests/unit/plugins/module_utils/test__util.py | 3 --- tests/unit/plugins/modules/test_docker_container_copy_into.py | 3 --- tests/unit/plugins/modules/test_docker_image.py | 3 --- tests/unit/plugins/modules/test_docker_image_build.py | 3 --- tests/unit/plugins/modules/test_docker_network.py | 3 --- tests/unit/plugins/modules/test_docker_swarm_service.py | 3 --- .../plugins/test_support/docker_image_archive_stubbing.py | 3 --- 35 files changed, 102 deletions(-) diff --git a/plugins/plugin_utils/_common.py b/plugins/plugin_utils/_common.py index b7b9198a..501b2fd4 100644 --- a/plugins/plugin_utils/_common.py +++ b/plugins/plugin_utils/_common.py @@ -7,10 +7,6 @@ from __future__ import annotations - -__metaclass__ = type - - from ansible.errors import AnsibleConnectionFailure from ansible.utils.display import Display from ansible_collections.community.docker.plugins.module_utils._common import ( diff --git a/plugins/plugin_utils/_socket_handler.py b/plugins/plugin_utils/_socket_handler.py index f1931688..1eebb905 100644 --- a/plugins/plugin_utils/_socket_handler.py +++ b/plugins/plugin_utils/_socket_handler.py @@ -7,10 +7,6 @@ from __future__ import annotations - -__metaclass__ = type - - import selectors from ansible_collections.community.docker.plugins.module_utils._socket_handler import ( diff --git a/tests/integration/targets/docker_container/filter_plugins/ipaddr_tools.py b/tests/integration/targets/docker_container/filter_plugins/ipaddr_tools.py index 4ff6b75a..5d33c0b3 100644 --- a/tests/integration/targets/docker_container/filter_plugins/ipaddr_tools.py +++ b/tests/integration/targets/docker_container/filter_plugins/ipaddr_tools.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations -__metaclass__ = type def _normalize_ipaddr(ipaddr): diff --git a/tests/integration/targets/generic_connection_tests/filter_plugins/filter_attr.py b/tests/integration/targets/generic_connection_tests/filter_plugins/filter_attr.py index abf7edce..7db34d4e 100644 --- a/tests/integration/targets/generic_connection_tests/filter_plugins/filter_attr.py +++ b/tests/integration/targets/generic_connection_tests/filter_plugins/filter_attr.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations -__metaclass__ = type def sanitize_host_info(data): diff --git a/tests/unit/plugins/connection/test_docker.py b/tests/unit/plugins/connection/test_docker.py index 68448a77..2090e468 100644 --- a/tests/unit/plugins/connection/test_docker.py +++ b/tests/unit/plugins/connection/test_docker.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - from io import StringIO from ansible.errors import AnsibleError diff --git a/tests/unit/plugins/inventory/test_docker_containers.py b/tests/unit/plugins/inventory/test_docker_containers.py index cbf64a9e..62c489b4 100644 --- a/tests/unit/plugins/inventory/test_docker_containers.py +++ b/tests/unit/plugins/inventory/test_docker_containers.py @@ -4,10 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - - import pytest from ansible.inventory.data import InventoryData from ansible.parsing.dataloader import DataLoader diff --git a/tests/unit/plugins/module_utils/_api/api/test_client.py b/tests/unit/plugins/module_utils/_api/api/test_client.py index ac52811f..bd1ef1dc 100644 --- a/tests/unit/plugins/module_utils/_api/api/test_client.py +++ b/tests/unit/plugins/module_utils/_api/api/test_client.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import datetime import io import json diff --git a/tests/unit/plugins/module_utils/_api/constants.py b/tests/unit/plugins/module_utils/_api/constants.py index 83443f77..30045194 100644 --- a/tests/unit/plugins/module_utils/_api/constants.py +++ b/tests/unit/plugins/module_utils/_api/constants.py @@ -9,6 +9,4 @@ from __future__ import annotations -__metaclass__ = type - DEFAULT_DOCKER_API_VERSION = "1.45" diff --git a/tests/unit/plugins/module_utils/_api/fake_api.py b/tests/unit/plugins/module_utils/_api/fake_api.py index 3a153131..23ddc9f4 100644 --- a/tests/unit/plugins/module_utils/_api/fake_api.py +++ b/tests/unit/plugins/module_utils/_api/fake_api.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - from ansible_collections.community.docker.plugins.module_utils._api import constants from ansible_collections.community.docker.tests.unit.plugins.module_utils._api.constants import ( DEFAULT_DOCKER_API_VERSION, diff --git a/tests/unit/plugins/module_utils/_api/fake_stat.py b/tests/unit/plugins/module_utils/_api/fake_stat.py index beeed2c0..f8691397 100644 --- a/tests/unit/plugins/module_utils/_api/fake_stat.py +++ b/tests/unit/plugins/module_utils/_api/fake_stat.py @@ -9,8 +9,6 @@ from __future__ import annotations -__metaclass__ = type - OBJ = { "read": "2015-02-11T19:20:46.667237763+02:00", "network": { diff --git a/tests/unit/plugins/module_utils/_api/test_auth.py b/tests/unit/plugins/module_utils/_api/test_auth.py index 6df1299a..8d2518ea 100644 --- a/tests/unit/plugins/module_utils/_api/test_auth.py +++ b/tests/unit/plugins/module_utils/_api/test_auth.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import base64 import json import os diff --git a/tests/unit/plugins/module_utils/_api/test_context.py b/tests/unit/plugins/module_utils/_api/test_context.py index cb3aded3..78348369 100644 --- a/tests/unit/plugins/module_utils/_api/test_context.py +++ b/tests/unit/plugins/module_utils/_api/test_context.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import unittest import pytest diff --git a/tests/unit/plugins/module_utils/_api/test_errors.py b/tests/unit/plugins/module_utils/_api/test_errors.py index c48c48bc..1d76ea4d 100644 --- a/tests/unit/plugins/module_utils/_api/test_errors.py +++ b/tests/unit/plugins/module_utils/_api/test_errors.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import unittest import requests diff --git a/tests/unit/plugins/module_utils/_api/transport/test_sshconn.py b/tests/unit/plugins/module_utils/_api/transport/test_sshconn.py index 47f57ff2..4fb18ceb 100644 --- a/tests/unit/plugins/module_utils/_api/transport/test_sshconn.py +++ b/tests/unit/plugins/module_utils/_api/transport/test_sshconn.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import unittest from ansible_collections.community.docker.plugins.module_utils._api.transport.sshconn import ( diff --git a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py index 8579a6c3..27759c6d 100644 --- a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py +++ b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import unittest import pytest diff --git a/tests/unit/plugins/module_utils/_api/utils/test_build.py b/tests/unit/plugins/module_utils/_api/utils/test_build.py index 3fc0a34f..8df7f327 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_build.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_build.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import os import os.path import shutil diff --git a/tests/unit/plugins/module_utils/_api/utils/test_config.py b/tests/unit/plugins/module_utils/_api/utils/test_config.py index db28978b..b4bf1cba 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_config.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_config.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import json import os import shutil diff --git a/tests/unit/plugins/module_utils/_api/utils/test_decorators.py b/tests/unit/plugins/module_utils/_api/utils/test_decorators.py index 1ff85f88..93d2019c 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_decorators.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_decorators.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import unittest from ansible_collections.community.docker.plugins.module_utils._api.api.client import ( diff --git a/tests/unit/plugins/module_utils/_api/utils/test_json_stream.py b/tests/unit/plugins/module_utils/_api/utils/test_json_stream.py index 0cb94925..cc9693aa 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_json_stream.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_json_stream.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - from ansible_collections.community.docker.plugins.module_utils._api.utils.json_stream import ( json_splitter, json_stream, diff --git a/tests/unit/plugins/module_utils/_api/utils/test_ports.py b/tests/unit/plugins/module_utils/_api/utils/test_ports.py index 366a9b36..a4b1aca0 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_ports.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_ports.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import unittest import pytest diff --git a/tests/unit/plugins/module_utils/_api/utils/test_proxy.py b/tests/unit/plugins/module_utils/_api/utils/test_proxy.py index ea62288c..d5e12e50 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_proxy.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_proxy.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import unittest from ansible_collections.community.docker.plugins.module_utils._api.utils.proxy import ( diff --git a/tests/unit/plugins/module_utils/_api/utils/test_utils.py b/tests/unit/plugins/module_utils/_api/utils/test_utils.py index 24e0fecc..52f9b1b0 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_utils.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_utils.py @@ -8,9 +8,6 @@ from __future__ import annotations - -__metaclass__ = type - import base64 import json import os diff --git a/tests/unit/plugins/module_utils/compose_v2_test_cases.py b/tests/unit/plugins/module_utils/compose_v2_test_cases.py index 806936d5..1b948caa 100644 --- a/tests/unit/plugins/module_utils/compose_v2_test_cases.py +++ b/tests/unit/plugins/module_utils/compose_v2_test_cases.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - from ansible_collections.community.docker.plugins.module_utils._compose_v2 import ( Event, ) diff --git a/tests/unit/plugins/module_utils/test__compose_v2.py b/tests/unit/plugins/module_utils/test__compose_v2.py index b174e148..f1c56ebc 100644 --- a/tests/unit/plugins/module_utils/test__compose_v2.py +++ b/tests/unit/plugins/module_utils/test__compose_v2.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest from ansible_collections.community.docker.plugins.module_utils._compose_v2 import ( Event, diff --git a/tests/unit/plugins/module_utils/test__copy.py b/tests/unit/plugins/module_utils/test__copy.py index 9d1ac613..9de4ed96 100644 --- a/tests/unit/plugins/module_utils/test__copy.py +++ b/tests/unit/plugins/module_utils/test__copy.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest from ansible_collections.community.docker.plugins.module_utils._copy import ( _stream_generator_to_fileobj, diff --git a/tests/unit/plugins/module_utils/test__image_archive.py b/tests/unit/plugins/module_utils/test__image_archive.py index d388d6b0..b9c93aeb 100644 --- a/tests/unit/plugins/module_utils/test__image_archive.py +++ b/tests/unit/plugins/module_utils/test__image_archive.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import tarfile import pytest diff --git a/tests/unit/plugins/module_utils/test__logfmt.py b/tests/unit/plugins/module_utils/test__logfmt.py index b06c4f50..3a3e9c39 100644 --- a/tests/unit/plugins/module_utils/test__logfmt.py +++ b/tests/unit/plugins/module_utils/test__logfmt.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest from ansible_collections.community.docker.plugins.module_utils._logfmt import ( InvalidLogFmt, diff --git a/tests/unit/plugins/module_utils/test__scramble.py b/tests/unit/plugins/module_utils/test__scramble.py index 7d32059d..5704ca25 100644 --- a/tests/unit/plugins/module_utils/test__scramble.py +++ b/tests/unit/plugins/module_utils/test__scramble.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest from ansible_collections.community.docker.plugins.module_utils._scramble import ( scramble, diff --git a/tests/unit/plugins/module_utils/test__util.py b/tests/unit/plugins/module_utils/test__util.py index 3a048e8a..7846c628 100644 --- a/tests/unit/plugins/module_utils/test__util.py +++ b/tests/unit/plugins/module_utils/test__util.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest from ansible_collections.community.docker.plugins.module_utils._util import ( compare_dict_allow_more_present, diff --git a/tests/unit/plugins/modules/test_docker_container_copy_into.py b/tests/unit/plugins/modules/test_docker_container_copy_into.py index 2319b4c3..baaf9eae 100644 --- a/tests/unit/plugins/modules/test_docker_container_copy_into.py +++ b/tests/unit/plugins/modules/test_docker_container_copy_into.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest from ansible_collections.community.docker.plugins.modules.docker_container_copy_into import ( parse_modern, diff --git a/tests/unit/plugins/modules/test_docker_image.py b/tests/unit/plugins/modules/test_docker_image.py index 4508433c..e92dc397 100644 --- a/tests/unit/plugins/modules/test_docker_image.py +++ b/tests/unit/plugins/modules/test_docker_image.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest from ansible_collections.community.docker.plugins.module_utils._image_archive import ( api_image_id, diff --git a/tests/unit/plugins/modules/test_docker_image_build.py b/tests/unit/plugins/modules/test_docker_image_build.py index 290592f9..3ad794b5 100644 --- a/tests/unit/plugins/modules/test_docker_image_build.py +++ b/tests/unit/plugins/modules/test_docker_image_build.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest from ansible_collections.community.docker.plugins.modules.docker_image_build import ( _quote_csv, diff --git a/tests/unit/plugins/modules/test_docker_network.py b/tests/unit/plugins/modules/test_docker_network.py index b3f11ddc..d24d736a 100644 --- a/tests/unit/plugins/modules/test_docker_network.py +++ b/tests/unit/plugins/modules/test_docker_network.py @@ -6,9 +6,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest from ansible_collections.community.docker.plugins.modules.docker_network import ( validate_cidr, diff --git a/tests/unit/plugins/modules/test_docker_swarm_service.py b/tests/unit/plugins/modules/test_docker_swarm_service.py index 8b76b77e..557c29b6 100644 --- a/tests/unit/plugins/modules/test_docker_swarm_service.py +++ b/tests/unit/plugins/modules/test_docker_swarm_service.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import pytest diff --git a/tests/unit/plugins/test_support/docker_image_archive_stubbing.py b/tests/unit/plugins/test_support/docker_image_archive_stubbing.py index 6be689c6..3c4de73c 100644 --- a/tests/unit/plugins/test_support/docker_image_archive_stubbing.py +++ b/tests/unit/plugins/test_support/docker_image_archive_stubbing.py @@ -4,9 +4,6 @@ from __future__ import annotations - -__metaclass__ = type - import json import tarfile from tempfile import TemporaryFile