From b85d36a01fdc2c9c160254e4b2e0c65f37993234 Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:37:14 +1300 Subject: [PATCH] filter plugins: adjust import __future__ for Python3, remove __metaclass__ (#9585) * filter plugins: adjust import __future__ for Python3, remove __metaclass__ * rollback chg in test file * add changelog frag --- .../fragments/9585-py3-imports-filter.yml | 22 +++++++++++++++++++ plugins/filter/counter.py | 3 +-- plugins/filter/crc32.py | 3 +-- plugins/filter/dict.py | 3 +-- plugins/filter/dict_kv.py | 3 +-- plugins/filter/from_csv.py | 3 +-- plugins/filter/from_ini.py | 3 +-- plugins/filter/groupby_as_dict.py | 3 +-- plugins/filter/hashids.py | 3 +-- plugins/filter/jc.py | 3 +-- plugins/filter/json_query.py | 3 +-- plugins/filter/keep_keys.py | 3 +-- plugins/filter/lists.py | 3 +-- plugins/filter/lists_mergeby.py | 3 +-- plugins/filter/random_mac.py | 3 +-- plugins/filter/remove_keys.py | 3 +-- plugins/filter/replace_keys.py | 3 +-- plugins/filter/reveal_ansible_type.py | 3 +-- plugins/filter/time.py | 3 +-- plugins/filter/to_ini.py | 4 +--- plugins/filter/unicode_normalize.py | 3 +-- plugins/filter/version_sort.py | 3 +-- 22 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 changelogs/fragments/9585-py3-imports-filter.yml diff --git a/changelogs/fragments/9585-py3-imports-filter.yml b/changelogs/fragments/9585-py3-imports-filter.yml new file mode 100644 index 0000000000..88644996b2 --- /dev/null +++ b/changelogs/fragments/9585-py3-imports-filter.yml @@ -0,0 +1,22 @@ +minor_changes: + - counter filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - crc32 filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - dict filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - dict_kv filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - from_csv filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - from_ini filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - groupby_as_dict filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - hashids filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - jc filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - json_query filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - keep_keys filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - lists filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - lists_mergeby filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - random_mac filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - remove_keys filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - replace_keys filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - reveal_ansible_type filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - time filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - to_ini filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - unicode_normalize filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). + - version_sort filter plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9585). diff --git a/plugins/filter/counter.py b/plugins/filter/counter.py index 93ffa64d01..bd4b5d4448 100644 --- a/plugins/filter/counter.py +++ b/plugins/filter/counter.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: counter diff --git a/plugins/filter/crc32.py b/plugins/filter/crc32.py index bdf6d51614..e394d23732 100644 --- a/plugins/filter/crc32.py +++ b/plugins/filter/crc32.py @@ -2,8 +2,7 @@ # Copyright (c) 2022, Julien Riou # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleFilterError from ansible.module_utils.common.text.converters import to_bytes diff --git a/plugins/filter/dict.py b/plugins/filter/dict.py index b3e81bd4ab..23c977dfd6 100644 --- a/plugins/filter/dict.py +++ b/plugins/filter/dict.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: dict diff --git a/plugins/filter/dict_kv.py b/plugins/filter/dict_kv.py index 8c4fb01752..1d73bde301 100644 --- a/plugins/filter/dict_kv.py +++ b/plugins/filter/dict_kv.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: dict_kv diff --git a/plugins/filter/from_csv.py b/plugins/filter/from_csv.py index 3a05769365..e9a5d73e53 100644 --- a/plugins/filter/from_csv.py +++ b/plugins/filter/from_csv.py @@ -5,8 +5,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: from_csv diff --git a/plugins/filter/from_ini.py b/plugins/filter/from_ini.py index 01ae150d08..d77338df99 100644 --- a/plugins/filter/from_ini.py +++ b/plugins/filter/from_ini.py @@ -4,7 +4,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations DOCUMENTATION = r""" name: from_ini @@ -44,7 +44,6 @@ _value: type: dictionary """ -__metaclass__ = type from ansible.errors import AnsibleFilterError from ansible.module_utils.six import string_types diff --git a/plugins/filter/groupby_as_dict.py b/plugins/filter/groupby_as_dict.py index 80c7ad7885..81a24a1e9f 100644 --- a/plugins/filter/groupby_as_dict.py +++ b/plugins/filter/groupby_as_dict.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: groupby_as_dict diff --git a/plugins/filter/hashids.py b/plugins/filter/hashids.py index ac771e6219..6ec64d5f59 100644 --- a/plugins/filter/hashids.py +++ b/plugins/filter/hashids.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.errors import ( AnsibleError, diff --git a/plugins/filter/jc.py b/plugins/filter/jc.py index 388fcf0d3f..48d53bcbd3 100644 --- a/plugins/filter/jc.py +++ b/plugins/filter/jc.py @@ -5,8 +5,7 @@ # # contributed by Kelly Brazil -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: jc diff --git a/plugins/filter/json_query.py b/plugins/filter/json_query.py index 61223b0702..8976694a94 100644 --- a/plugins/filter/json_query.py +++ b/plugins/filter/json_query.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: json_query diff --git a/plugins/filter/keep_keys.py b/plugins/filter/keep_keys.py index 4cff4405fc..98b34b4197 100644 --- a/plugins/filter/keep_keys.py +++ b/plugins/filter/keep_keys.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: keep_keys diff --git a/plugins/filter/lists.py b/plugins/filter/lists.py index d16f955c22..707ec9f1fe 100644 --- a/plugins/filter/lists.py +++ b/plugins/filter/lists.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from ansible.errors import AnsibleFilterError from ansible.module_utils.common.collections import is_sequence diff --git a/plugins/filter/lists_mergeby.py b/plugins/filter/lists_mergeby.py index b34246993c..b15df2e089 100644 --- a/plugins/filter/lists_mergeby.py +++ b/plugins/filter/lists_mergeby.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: lists_mergeby diff --git a/plugins/filter/random_mac.py b/plugins/filter/random_mac.py index 49910bc6be..1ece58230c 100644 --- a/plugins/filter/random_mac.py +++ b/plugins/filter/random_mac.py @@ -4,8 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: random_mac diff --git a/plugins/filter/remove_keys.py b/plugins/filter/remove_keys.py index 7baee12695..2058803138 100644 --- a/plugins/filter/remove_keys.py +++ b/plugins/filter/remove_keys.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: remove_keys diff --git a/plugins/filter/replace_keys.py b/plugins/filter/replace_keys.py index f317144be4..d47468bd3c 100644 --- a/plugins/filter/replace_keys.py +++ b/plugins/filter/replace_keys.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: replace_keys diff --git a/plugins/filter/reveal_ansible_type.py b/plugins/filter/reveal_ansible_type.py index 3d7e40111c..36fcba3df2 100644 --- a/plugins/filter/reveal_ansible_type.py +++ b/plugins/filter/reveal_ansible_type.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: reveal_ansible_type diff --git a/plugins/filter/time.py b/plugins/filter/time.py index 25970cd260..e8a867a1fe 100644 --- a/plugins/filter/time.py +++ b/plugins/filter/time.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import re from ansible.errors import AnsibleFilterError diff --git a/plugins/filter/to_ini.py b/plugins/filter/to_ini.py index f06763ac66..4be1a684e7 100644 --- a/plugins/filter/to_ini.py +++ b/plugins/filter/to_ini.py @@ -4,7 +4,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations DOCUMENTATION = r""" name: to_ini @@ -50,8 +50,6 @@ _value: """ -__metaclass__ = type - from ansible.errors import AnsibleFilterError from ansible.module_utils.common._collections_compat import Mapping from ansible.module_utils.six.moves import StringIO diff --git a/plugins/filter/unicode_normalize.py b/plugins/filter/unicode_normalize.py index 9401197eba..e897bb9cee 100644 --- a/plugins/filter/unicode_normalize.py +++ b/plugins/filter/unicode_normalize.py @@ -4,8 +4,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: unicode_normalize diff --git a/plugins/filter/version_sort.py b/plugins/filter/version_sort.py index f5a844c542..f3fb30035a 100644 --- a/plugins/filter/version_sort.py +++ b/plugins/filter/version_sort.py @@ -3,8 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" name: version_sort