diff --git a/changelogs/fragments/9583-py3-imports-actionbecomecachecallback.yml b/changelogs/fragments/9583-py3-imports-actionbecomecachecallback.yml new file mode 100644 index 0000000000..3838e52ae9 --- /dev/null +++ b/changelogs/fragments/9583-py3-imports-actionbecomecachecallback.yml @@ -0,0 +1,43 @@ +minor_changes: + - iptables_state action plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - shutdown action plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - doas become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - dzdo become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - ksu become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - machinectl become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - pbrun become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - pfexec become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - pmrun become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - run0 become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - sesu become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - sudosu become plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - memcached cache plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - pickle cache plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - redis cache plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - yaml cache plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - cgroup_memory_recap callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - context_demo callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - counter_enabled callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - default_without_diff callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - dense callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - diy callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - elastic callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - jabber callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - log_plays callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - loganalytics callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - logdna callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - logentries callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - logstash callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - mail callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - nrdp callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - null callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - opentelemetry callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - say callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - selective callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - slack callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - splunk callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - sumologic callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - syslog_json callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - timestamp callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - unixy callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). + - yaml callback plugin - adjust standard preamble for Python 3 (https://github.com/ansible-collections/community.general/pull/9583). diff --git a/plugins/action/iptables_state.py b/plugins/action/iptables_state.py index 39ee85d778..595d0ece66 100644 --- a/plugins/action/iptables_state.py +++ b/plugins/action/iptables_state.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 time diff --git a/plugins/action/shutdown.py b/plugins/action/shutdown.py index e5c2d15a5c..d5db878812 100644 --- a/plugins/action/shutdown.py +++ b/plugins/action/shutdown.py @@ -5,9 +5,8 @@ # 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 -__metaclass__ = type from ansible.errors import AnsibleError, AnsibleConnectionFailure from ansible.module_utils.common.text.converters import to_native, to_text diff --git a/plugins/become/doas.py b/plugins/become/doas.py index 9011fa69e9..13aef19874 100644 --- a/plugins/become/doas.py +++ b/plugins/become/doas.py @@ -2,8 +2,7 @@ # Copyright (c) 2018, Ansible Project # 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: doas diff --git a/plugins/become/dzdo.py b/plugins/become/dzdo.py index 70e2e0d777..d890bede09 100644 --- a/plugins/become/dzdo.py +++ b/plugins/become/dzdo.py @@ -2,8 +2,7 @@ # Copyright (c) 2018, Ansible Project # 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: dzdo diff --git a/plugins/become/ksu.py b/plugins/become/ksu.py index 88a29e7362..1c936e46da 100644 --- a/plugins/become/ksu.py +++ b/plugins/become/ksu.py @@ -2,8 +2,7 @@ # Copyright (c) 2018, Ansible Project # 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: ksu diff --git a/plugins/become/machinectl.py b/plugins/become/machinectl.py index 1dd80bc80f..81a9d06f86 100644 --- a/plugins/become/machinectl.py +++ b/plugins/become/machinectl.py @@ -2,8 +2,7 @@ # Copyright (c) 2018, Ansible Project # 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: machinectl diff --git a/plugins/become/pbrun.py b/plugins/become/pbrun.py index 56f3b2c315..92a49fe349 100644 --- a/plugins/become/pbrun.py +++ b/plugins/become/pbrun.py @@ -2,8 +2,7 @@ # Copyright (c) 2018, Ansible Project # 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: pbrun diff --git a/plugins/become/pfexec.py b/plugins/become/pfexec.py index b23509281c..65690f359b 100644 --- a/plugins/become/pfexec.py +++ b/plugins/become/pfexec.py @@ -2,8 +2,7 @@ # Copyright (c) 2018, Ansible Project # 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: pfexec diff --git a/plugins/become/pmrun.py b/plugins/become/pmrun.py index 64820ecde5..a2432d92ee 100644 --- a/plugins/become/pmrun.py +++ b/plugins/become/pmrun.py @@ -2,8 +2,7 @@ # Copyright (c) 2018, Ansible Project # 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: pmrun diff --git a/plugins/become/run0.py b/plugins/become/run0.py index 0c0d6bfffb..39e4667e7a 100644 --- a/plugins/become/run0.py +++ b/plugins/become/run0.py @@ -3,9 +3,8 @@ # 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 -__metaclass__ = type DOCUMENTATION = r""" name: run0 diff --git a/plugins/become/sesu.py b/plugins/become/sesu.py index 6fe64e41f8..cf921e2e47 100644 --- a/plugins/become/sesu.py +++ b/plugins/become/sesu.py @@ -2,8 +2,7 @@ # Copyright (c) 2018, Ansible Project # 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: sesu diff --git a/plugins/become/sudosu.py b/plugins/become/sudosu.py index fe85c9ee91..509b2725df 100644 --- a/plugins/become/sudosu.py +++ b/plugins/become/sudosu.py @@ -2,8 +2,7 @@ # Copyright (c) 2021, Ansible Project # 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: sudosu diff --git a/plugins/cache/memcached.py b/plugins/cache/memcached.py index 94cc7058d8..9c4fbec595 100644 --- a/plugins/cache/memcached.py +++ b/plugins/cache/memcached.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""" author: Unknown (!UNKNOWN) diff --git a/plugins/cache/pickle.py b/plugins/cache/pickle.py index 60b1ea74e0..2f4b2b7b02 100644 --- a/plugins/cache/pickle.py +++ b/plugins/cache/pickle.py @@ -5,8 +5,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: pickle diff --git a/plugins/cache/redis.py b/plugins/cache/redis.py index 30d5364032..41f69d659f 100644 --- a/plugins/cache/redis.py +++ b/plugins/cache/redis.py @@ -3,8 +3,7 @@ # Copyright (c) 2017 Ansible Project # 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""" author: Unknown (!UNKNOWN) diff --git a/plugins/cache/yaml.py b/plugins/cache/yaml.py index 88cdad2acb..676423d3b6 100644 --- a/plugins/cache/yaml.py +++ b/plugins/cache/yaml.py @@ -5,8 +5,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: yaml diff --git a/plugins/callback/cgroup_memory_recap.py b/plugins/callback/cgroup_memory_recap.py index 079d1ccd08..b4099eae49 100644 --- a/plugins/callback/cgroup_memory_recap.py +++ b/plugins/callback/cgroup_memory_recap.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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/context_demo.py b/plugins/callback/context_demo.py index 96acd2f947..28be2882b6 100644 --- a/plugins/callback/context_demo.py +++ b/plugins/callback/context_demo.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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/counter_enabled.py b/plugins/callback/counter_enabled.py index 845a7823e0..15fc85a01b 100644 --- a/plugins/callback/counter_enabled.py +++ b/plugins/callback/counter_enabled.py @@ -6,8 +6,7 @@ Counter enabled Ansible callback plugin (See DOCUMENTATION for more information) ''' -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/default_without_diff.py b/plugins/callback/default_without_diff.py index b6ef75ce91..3ea55100bf 100644 --- a/plugins/callback/default_without_diff.py +++ b/plugins/callback/default_without_diff.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: default_without_diff diff --git a/plugins/callback/dense.py b/plugins/callback/dense.py index cf1130e3d1..67cad4fd8f 100644 --- a/plugins/callback/dense.py +++ b/plugins/callback/dense.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: dense diff --git a/plugins/callback/diy.py b/plugins/callback/diy.py index 5e46563aa4..b3cd0cdbce 100644 --- a/plugins/callback/diy.py +++ b/plugins/callback/diy.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: diy diff --git a/plugins/callback/elastic.py b/plugins/callback/elastic.py index 6866e52712..cfa66e53b9 100644 --- a/plugins/callback/elastic.py +++ b/plugins/callback/elastic.py @@ -2,8 +2,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""" author: Victor Martinez (@v1v) diff --git a/plugins/callback/jabber.py b/plugins/callback/jabber.py index 8f9d7cd833..10aa866142 100644 --- a/plugins/callback/jabber.py +++ b/plugins/callback/jabber.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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/log_plays.py b/plugins/callback/log_plays.py index ed1ed39a72..483976acae 100644 --- a/plugins/callback/log_plays.py +++ b/plugins/callback/log_plays.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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/loganalytics.py b/plugins/callback/loganalytics.py index fa891bd10c..224ce7efd8 100644 --- a/plugins/callback/loganalytics.py +++ b/plugins/callback/loganalytics.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: loganalytics diff --git a/plugins/callback/logdna.py b/plugins/callback/logdna.py index 35c5b86c1e..90fe6d4465 100644 --- a/plugins/callback/logdna.py +++ b/plugins/callback/logdna.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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/logentries.py b/plugins/callback/logentries.py index 0b3e2baaf0..bc5d7e03ce 100644 --- a/plugins/callback/logentries.py +++ b/plugins/callback/logentries.py @@ -3,8 +3,7 @@ # Copyright (c) 2017 Ansible Project # 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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/logstash.py b/plugins/callback/logstash.py index 088a84bf78..9d299e50ed 100644 --- a/plugins/callback/logstash.py +++ b/plugins/callback/logstash.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""" author: Yevhen Khmelenko (@ujenmr) diff --git a/plugins/callback/mail.py b/plugins/callback/mail.py index 7571993ea4..80bef26044 100644 --- a/plugins/callback/mail.py +++ b/plugins/callback/mail.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: mail diff --git a/plugins/callback/nrdp.py b/plugins/callback/nrdp.py index fa5d7cfd05..375876973a 100644 --- a/plugins/callback/nrdp.py +++ b/plugins/callback/nrdp.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: nrdp diff --git a/plugins/callback/null.py b/plugins/callback/null.py index 0cc722f63b..b59389e39a 100644 --- a/plugins/callback/null.py +++ b/plugins/callback/null.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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/opentelemetry.py b/plugins/callback/opentelemetry.py index 38388e8270..039408f301 100644 --- a/plugins/callback/opentelemetry.py +++ b/plugins/callback/opentelemetry.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""" author: Victor Martinez (@v1v) diff --git a/plugins/callback/say.py b/plugins/callback/say.py index 94f49cc822..e6da490ec7 100644 --- a/plugins/callback/say.py +++ b/plugins/callback/say.py @@ -5,8 +5,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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/selective.py b/plugins/callback/selective.py index 27ac63658c..9cc805d3cd 100644 --- a/plugins/callback/selective.py +++ b/plugins/callback/selective.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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/slack.py b/plugins/callback/slack.py index fda430b778..a9290f4a93 100644 --- a/plugins/callback/slack.py +++ b/plugins/callback/slack.py @@ -5,8 +5,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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/splunk.py b/plugins/callback/splunk.py index 05cca87a69..1d4534892a 100644 --- a/plugins/callback/splunk.py +++ b/plugins/callback/splunk.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: splunk diff --git a/plugins/callback/sumologic.py b/plugins/callback/sumologic.py index 108f324b29..5c310d1c50 100644 --- a/plugins/callback/sumologic.py +++ b/plugins/callback/sumologic.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: sumologic diff --git a/plugins/callback/syslog_json.py b/plugins/callback/syslog_json.py index d1797455ac..9e5c78c90c 100644 --- a/plugins/callback/syslog_json.py +++ b/plugins/callback/syslog_json.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""" author: Unknown (!UNKNOWN) diff --git a/plugins/callback/timestamp.py b/plugins/callback/timestamp.py index 89249c6562..a43ddcbef9 100644 --- a/plugins/callback/timestamp.py +++ b/plugins/callback/timestamp.py @@ -5,9 +5,8 @@ # 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 -__metaclass__ = type DOCUMENTATION = r""" name: timestamp diff --git a/plugins/callback/unixy.py b/plugins/callback/unixy.py index 8f80bf8f12..48f9b2d1f0 100644 --- a/plugins/callback/unixy.py +++ b/plugins/callback/unixy.py @@ -5,8 +5,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: unixy diff --git a/plugins/callback/yaml.py b/plugins/callback/yaml.py index a68c590cf7..25c797e236 100644 --- a/plugins/callback/yaml.py +++ b/plugins/callback/yaml.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""" author: Unknown (!UNKNOWN)