From 0c5466de4746278da45e5dae204b08c6611156d0 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 30 Oct 2025 20:17:10 +0100 Subject: [PATCH] Cleanup: remove unicode prefix, remove explicit inheritance from object (#11015) * Address UP025: remove unicode literals from strings. * Address UP004: class inherits from 'object'. --- plugins/cache/memcached.py | 2 +- plugins/callback/diy.py | 2 +- plugins/callback/elastic.py | 2 +- plugins/callback/loganalytics.py | 2 +- plugins/callback/logentries.py | 2 +- plugins/callback/opentelemetry.py | 2 +- plugins/callback/splunk.py | 2 +- plugins/callback/sumologic.py | 2 +- plugins/doc_fragments/alicloud.py | 2 +- plugins/doc_fragments/attributes.py | 2 +- plugins/doc_fragments/auth_basic.py | 2 +- plugins/doc_fragments/bitbucket.py | 2 +- plugins/doc_fragments/dimensiondata.py | 2 +- plugins/doc_fragments/dimensiondata_wait.py | 2 +- plugins/doc_fragments/django.py | 2 +- plugins/doc_fragments/emc.py | 2 +- plugins/doc_fragments/gitlab.py | 2 +- plugins/doc_fragments/hpe3par.py | 2 +- plugins/doc_fragments/hwc.py | 2 +- plugins/doc_fragments/ibm_storage.py | 2 +- plugins/doc_fragments/influxdb.py | 2 +- plugins/doc_fragments/ipa.py | 2 +- plugins/doc_fragments/keycloak.py | 2 +- plugins/doc_fragments/ldap.py | 2 +- plugins/doc_fragments/lxca_common.py | 2 +- plugins/doc_fragments/manageiq.py | 2 +- plugins/doc_fragments/nomad.py | 2 +- plugins/doc_fragments/onepassword.py | 2 +- plugins/doc_fragments/oneview.py | 2 +- plugins/doc_fragments/online.py | 2 +- plugins/doc_fragments/opennebula.py | 2 +- plugins/doc_fragments/openswitch.py | 2 +- plugins/doc_fragments/oracle.py | 2 +- .../oracle_creatable_resource.py | 2 +- .../oracle_display_name_option.py | 2 +- plugins/doc_fragments/oracle_name_option.py | 2 +- plugins/doc_fragments/oracle_tags.py | 2 +- plugins/doc_fragments/oracle_wait_options.py | 2 +- plugins/doc_fragments/pipx.py | 2 +- plugins/doc_fragments/pritunl.py | 2 +- plugins/doc_fragments/redfish.py | 2 +- plugins/doc_fragments/redis.py | 2 +- plugins/doc_fragments/rundeck.py | 2 +- plugins/doc_fragments/scaleway.py | 2 +- .../scaleway_waitable_resource.py | 2 +- plugins/doc_fragments/utm.py | 2 +- plugins/doc_fragments/vexata.py | 2 +- plugins/doc_fragments/xenserver.py | 2 +- plugins/filter/accumulate.py | 2 +- plugins/filter/counter.py | 2 +- plugins/filter/dict.py | 2 +- plugins/filter/dict_kv.py | 2 +- plugins/filter/from_csv.py | 2 +- plugins/filter/from_ini.py | 2 +- plugins/filter/groupby_as_dict.py | 2 +- plugins/filter/hashids.py | 2 +- plugins/filter/jc.py | 2 +- plugins/filter/json_query.py | 2 +- plugins/filter/keep_keys.py | 2 +- plugins/filter/lists.py | 2 +- plugins/filter/lists_mergeby.py | 2 +- plugins/filter/remove_keys.py | 2 +- plugins/filter/replace_keys.py | 2 +- plugins/filter/reveal_ansible_type.py | 2 +- plugins/filter/time.py | 2 +- plugins/filter/to_ini.py | 2 +- plugins/filter/to_prettytable.py | 2 +- plugins/filter/to_yaml.py | 2 +- plugins/filter/unicode_normalize.py | 2 +- plugins/filter/version_sort.py | 2 +- plugins/lookup/bitwarden.py | 2 +- plugins/lookup/bitwarden_secrets_manager.py | 2 +- plugins/lookup/hiera.py | 2 +- plugins/lookup/lastpass.py | 2 +- plugins/lookup/onepassword.py | 4 +- plugins/lookup/tss.py | 2 +- plugins/module_utils/_stormssh.py | 2 +- plugins/module_utils/android_sdkmanager.py | 2 +- plugins/module_utils/btrfs.py | 10 ++-- plugins/module_utils/cloud.py | 2 +- plugins/module_utils/cmd_runner.py | 4 +- plugins/module_utils/cmd_runner_fmt.py | 2 +- plugins/module_utils/deps.py | 2 +- plugins/module_utils/dimensiondata.py | 2 +- plugins/module_utils/gandi_livedns_api.py | 2 +- plugins/module_utils/homebrew.py | 2 +- plugins/module_utils/hwc_utils.py | 6 +-- .../identity/keycloak/keycloak.py | 2 +- plugins/module_utils/ipa.py | 2 +- plugins/module_utils/ldap.py | 2 +- plugins/module_utils/lxd.py | 2 +- plugins/module_utils/manageiq.py | 6 +-- plugins/module_utils/memset.py | 2 +- plugins/module_utils/mh/base.py | 2 +- .../module_utils/mh/mixins/deprecate_attrs.py | 2 +- plugins/module_utils/mh/mixins/state.py | 2 +- plugins/module_utils/ocapi_utils.py | 2 +- plugins/module_utils/onepassword.py | 2 +- plugins/module_utils/oneview.py | 2 +- plugins/module_utils/online.py | 4 +- plugins/module_utils/redfish_utils.py | 2 +- plugins/module_utils/redis.py | 2 +- plugins/module_utils/scaleway.py | 6 +-- plugins/module_utils/vardict.py | 4 +- plugins/module_utils/xenserver.py | 4 +- plugins/modules/alerta_customer.py | 2 +- plugins/modules/alternatives.py | 2 +- plugins/modules/apache2_mod_proxy.py | 4 +- plugins/modules/archive.py | 2 +- plugins/modules/beadm.py | 2 +- plugins/modules/bower.py | 2 +- plugins/modules/btrfs_subvolume.py | 2 +- plugins/modules/bzr.py | 2 +- plugins/modules/capabilities.py | 2 +- plugins/modules/cargo.py | 2 +- plugins/modules/cloudflare_dns.py | 2 +- plugins/modules/consul.py | 4 +- plugins/modules/copr.py | 2 +- plugins/modules/cronvar.py | 2 +- plugins/modules/crypttab.py | 4 +- plugins/modules/dconf.py | 4 +- plugins/modules/deploy_helper.py | 2 +- plugins/modules/dimensiondata_vlan.py | 2 +- plugins/modules/dnsmadeeasy.py | 2 +- plugins/modules/ejabberd_user.py | 2 +- plugins/modules/filesystem.py | 4 +- plugins/modules/github_deploy_key.py | 2 +- plugins/modules/github_key.py | 4 +- plugins/modules/gitlab_branch.py | 2 +- plugins/modules/gitlab_deploy_key.py | 2 +- plugins/modules/gitlab_group.py | 2 +- plugins/modules/gitlab_group_access_token.py | 2 +- plugins/modules/gitlab_group_members.py | 2 +- plugins/modules/gitlab_group_variable.py | 2 +- plugins/modules/gitlab_hook.py | 2 +- plugins/modules/gitlab_instance_variable.py | 2 +- plugins/modules/gitlab_issue.py | 2 +- plugins/modules/gitlab_label.py | 2 +- plugins/modules/gitlab_merge_request.py | 2 +- plugins/modules/gitlab_milestone.py | 2 +- plugins/modules/gitlab_project.py | 2 +- .../modules/gitlab_project_access_token.py | 2 +- plugins/modules/gitlab_project_members.py | 2 +- plugins/modules/gitlab_project_variable.py | 2 +- plugins/modules/gitlab_protected_branch.py | 2 +- plugins/modules/gitlab_runner.py | 2 +- plugins/modules/gitlab_user.py | 2 +- plugins/modules/haproxy.py | 2 +- plugins/modules/hg.py | 2 +- plugins/modules/homebrew.py | 2 +- plugins/modules/homebrew_cask.py | 2 +- plugins/modules/homectl.py | 2 +- plugins/modules/hwc_network_vpc.py | 2 +- plugins/modules/imgadm.py | 2 +- plugins/modules/infinity.py | 2 +- plugins/modules/ip_netns.py | 2 +- plugins/modules/ipa_getkeytab.py | 2 +- plugins/modules/ipbase_info.py | 2 +- plugins/modules/ipify_facts.py | 2 +- plugins/modules/ipinfoio_facts.py | 2 +- plugins/modules/ipwcli_dns.py | 2 +- plugins/modules/jenkins_job.py | 2 +- plugins/modules/jenkins_plugin.py | 2 +- plugins/modules/kdeconfig.py | 2 +- plugins/modules/krb_ticket.py | 2 +- plugins/modules/lvg_rename.py | 2 +- plugins/modules/lxc_container.py | 2 +- plugins/modules/lxd_container.py | 2 +- plugins/modules/lxd_profile.py | 2 +- plugins/modules/lxd_project.py | 2 +- plugins/modules/manageiq_alert_profiles.py | 2 +- plugins/modules/manageiq_alerts.py | 4 +- plugins/modules/manageiq_group.py | 2 +- plugins/modules/manageiq_provider.py | 2 +- plugins/modules/manageiq_tenant.py | 2 +- plugins/modules/manageiq_user.py | 2 +- plugins/modules/mas.py | 2 +- plugins/modules/maven_artifact.py | 2 +- plugins/modules/modprobe.py | 2 +- plugins/modules/monit.py | 4 +- plugins/modules/nagios.py | 2 +- plugins/modules/nginx_status_info.py | 2 +- plugins/modules/nictagadm.py | 2 +- plugins/modules/nmcli.py | 2 +- plugins/modules/npm.py | 2 +- plugins/modules/nsupdate.py | 2 +- plugins/modules/onepassword_info.py | 2 +- plugins/modules/opendj_backendprop.py | 2 +- plugins/modules/osx_defaults.py | 2 +- plugins/modules/pacman.py | 4 +- plugins/modules/pacman_key.py | 4 +- plugins/modules/pagerduty.py | 2 +- plugins/modules/pagerduty_user.py | 2 +- plugins/modules/pamd.py | 4 +- plugins/modules/pids.py | 4 +- plugins/modules/pkgin.py | 2 +- plugins/modules/pmem.py | 2 +- plugins/modules/pnpm.py | 2 +- plugins/modules/pulp_repo.py | 2 +- plugins/modules/pushover.py | 2 +- plugins/modules/redhat_subscription.py | 8 +-- plugins/modules/rhevm.py | 4 +- plugins/modules/rhsm_repository.py | 2 +- .../modules/rundeck_job_executions_info.py | 2 +- plugins/modules/rundeck_job_run.py | 2 +- plugins/modules/rundeck_project.py | 2 +- plugins/modules/runit.py | 2 +- plugins/modules/simpleinit_msb.py | 2 +- plugins/modules/smartos_image_info.py | 2 +- plugins/modules/snmp_facts.py | 2 +- plugins/modules/solaris_zone.py | 2 +- plugins/modules/ssh_config.py | 2 +- plugins/modules/stacki_host.py | 2 +- plugins/modules/sudoers.py | 2 +- plugins/modules/svc.py | 2 +- plugins/modules/swupd.py | 2 +- plugins/modules/timezone.py | 2 +- plugins/modules/yarn.py | 2 +- plugins/modules/zfs.py | 2 +- plugins/modules/zfs_delegate_admin.py | 2 +- plugins/modules/zfs_facts.py | 2 +- plugins/modules/zpool.py | 2 +- plugins/modules/zpool_facts.py | 2 +- plugins/test/a_module.py | 2 +- plugins/test/ansible_type.py | 2 +- plugins/test/fqdn_valid.py | 2 +- ruff.toml | 2 - .../unit/plugins/inventory/test_opennebula.py | 4 +- .../plugins/module_utils/test_database.py | 54 +++++++++---------- .../module_utils/test_module_helper.py | 2 +- .../plugins/module_utils/test_saslprep.py | 50 ++++++++--------- .../module_utils/xenserver/FakeXenAPI.py | 2 +- tests/unit/plugins/modules/FakeXenAPI.py | 2 +- tests/unit/plugins/modules/gitlab.py | 2 +- tests/unit/plugins/modules/hpe_test_utils.py | 4 +- .../plugins/modules/test_alerta_customer.py | 2 +- .../modules/test_circonus_annotation.py | 2 +- .../plugins/modules/test_jenkins_plugin.py | 2 +- .../plugins/modules/test_pagerduty_alert.py | 2 +- .../plugins/modules/test_rhsm_repository.py | 2 +- tests/unit/plugins/modules/uthelper.py | 2 +- .../unit/plugins/plugin_utils/test_unsafe.py | 12 ++--- 242 files changed, 329 insertions(+), 331 deletions(-) diff --git a/plugins/cache/memcached.py b/plugins/cache/memcached.py index 28011e8cab..d7dcf2f712 100644 --- a/plugins/cache/memcached.py +++ b/plugins/cache/memcached.py @@ -66,7 +66,7 @@ except ImportError: display = Display() -class ProxyClientPool(object): +class ProxyClientPool: """ Memcached connection pooling for thread/fork safety. Inspired by py-redis connection pool. diff --git a/plugins/callback/diy.py b/plugins/callback/diy.py index c94fe25093..68de880793 100644 --- a/plugins/callback/diy.py +++ b/plugins/callback/diy.py @@ -791,7 +791,7 @@ except ImportError: SUPPORTS_DATA_TAGGING = False -class DummyStdout(object): +class DummyStdout: def flush(self): pass diff --git a/plugins/callback/elastic.py b/plugins/callback/elastic.py index ed0949a753..9b0340deb8 100644 --- a/plugins/callback/elastic.py +++ b/plugins/callback/elastic.py @@ -138,7 +138,7 @@ class HostData: self.finish = time.time() -class ElasticSource(object): +class ElasticSource: def __init__(self, display): self.ansible_playbook = "" self.session = str(uuid.uuid4()) diff --git a/plugins/callback/loganalytics.py b/plugins/callback/loganalytics.py index 05996f2492..b39cefb932 100644 --- a/plugins/callback/loganalytics.py +++ b/plugins/callback/loganalytics.py @@ -71,7 +71,7 @@ from ansible_collections.community.general.plugins.module_utils.datetime import ) -class AzureLogAnalyticsSource(object): +class AzureLogAnalyticsSource: def __init__(self): self.ansible_check_mode = False self.ansible_playbook = "" diff --git a/plugins/callback/logentries.py b/plugins/callback/logentries.py index 855bffa1c4..726ef81a9a 100644 --- a/plugins/callback/logentries.py +++ b/plugins/callback/logentries.py @@ -120,7 +120,7 @@ from ansible.plugins.callback import CallbackBase # * Better formatting of output before sending out to logentries data/api nodes. -class PlainTextSocketAppender(object): +class PlainTextSocketAppender: def __init__(self, display, LE_API='data.logentries.com', LE_PORT=80, LE_TLS_PORT=443): self.LE_API = LE_API diff --git a/plugins/callback/opentelemetry.py b/plugins/callback/opentelemetry.py index 6243992822..89817847a6 100644 --- a/plugins/callback/opentelemetry.py +++ b/plugins/callback/opentelemetry.py @@ -208,7 +208,7 @@ class HostData: self.finish = time_ns() -class OpenTelemetrySource(object): +class OpenTelemetrySource: def __init__(self, display): self.ansible_playbook = "" self.session = str(uuid.uuid4()) diff --git a/plugins/callback/splunk.py b/plugins/callback/splunk.py index 635a3109bc..74b905c9c2 100644 --- a/plugins/callback/splunk.py +++ b/plugins/callback/splunk.py @@ -100,7 +100,7 @@ from ansible_collections.community.general.plugins.module_utils.datetime import ) -class SplunkHTTPCollectorSource(object): +class SplunkHTTPCollectorSource: def __init__(self): self.ansible_check_mode = False self.ansible_playbook = "" diff --git a/plugins/callback/sumologic.py b/plugins/callback/sumologic.py index 3f99bf216a..a460118e9b 100644 --- a/plugins/callback/sumologic.py +++ b/plugins/callback/sumologic.py @@ -57,7 +57,7 @@ from ansible_collections.community.general.plugins.module_utils.datetime import ) -class SumologicHTTPCollectorSource(object): +class SumologicHTTPCollectorSource: def __init__(self): self.ansible_check_mode = False self.ansible_playbook = "" diff --git a/plugins/doc_fragments/alicloud.py b/plugins/doc_fragments/alicloud.py index f0083c9946..87ed982cd7 100644 --- a/plugins/doc_fragments/alicloud.py +++ b/plugins/doc_fragments/alicloud.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Alicloud only documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/attributes.py b/plugins/doc_fragments/attributes.py index fdafe1aeaa..56af8d75c8 100644 --- a/plugins/doc_fragments/attributes.py +++ b/plugins/doc_fragments/attributes.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/auth_basic.py b/plugins/doc_fragments/auth_basic.py index 3d99466165..4af17e96a8 100644 --- a/plugins/doc_fragments/auth_basic.py +++ b/plugins/doc_fragments/auth_basic.py @@ -5,7 +5,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard files documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/bitbucket.py b/plugins/doc_fragments/bitbucket.py index c96a010e71..a27ee13dc9 100644 --- a/plugins/doc_fragments/bitbucket.py +++ b/plugins/doc_fragments/bitbucket.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/dimensiondata.py b/plugins/doc_fragments/dimensiondata.py index 8ed3d296aa..895c31ecc6 100644 --- a/plugins/doc_fragments/dimensiondata.py +++ b/plugins/doc_fragments/dimensiondata.py @@ -15,7 +15,7 @@ from __future__ import annotations # -class ModuleDocFragment(object): +class ModuleDocFragment: # Dimension Data doc fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/dimensiondata_wait.py b/plugins/doc_fragments/dimensiondata_wait.py index f895a4accb..25bca02d68 100644 --- a/plugins/doc_fragments/dimensiondata_wait.py +++ b/plugins/doc_fragments/dimensiondata_wait.py @@ -15,7 +15,7 @@ from __future__ import annotations # -class ModuleDocFragment(object): +class ModuleDocFragment: # Dimension Data ("wait-for-completion" parameters) doc fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/django.py b/plugins/doc_fragments/django.py index f62e2224d8..bbe2256993 100644 --- a/plugins/doc_fragments/django.py +++ b/plugins/doc_fragments/django.py @@ -5,7 +5,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: venv: diff --git a/plugins/doc_fragments/emc.py b/plugins/doc_fragments/emc.py index 9268b7fc42..5af0e6eb97 100644 --- a/plugins/doc_fragments/emc.py +++ b/plugins/doc_fragments/emc.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Documentation fragment for VNX (emc_vnx) EMC_VNX = r''' diff --git a/plugins/doc_fragments/gitlab.py b/plugins/doc_fragments/gitlab.py index af7a527a81..b78b6ac2c6 100644 --- a/plugins/doc_fragments/gitlab.py +++ b/plugins/doc_fragments/gitlab.py @@ -5,7 +5,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard files documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/hpe3par.py b/plugins/doc_fragments/hpe3par.py index e126c63c56..da41509849 100644 --- a/plugins/doc_fragments/hpe3par.py +++ b/plugins/doc_fragments/hpe3par.py @@ -5,7 +5,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # HPE 3PAR doc fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/hwc.py b/plugins/doc_fragments/hwc.py index 99362243ec..2415c8d0d9 100644 --- a/plugins/doc_fragments/hwc.py +++ b/plugins/doc_fragments/hwc.py @@ -5,7 +5,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # HWC doc fragment. DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/ibm_storage.py b/plugins/doc_fragments/ibm_storage.py index ab61cd51c1..950e8f443f 100644 --- a/plugins/doc_fragments/ibm_storage.py +++ b/plugins/doc_fragments/ibm_storage.py @@ -7,7 +7,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # ibm_storage documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/influxdb.py b/plugins/doc_fragments/influxdb.py index 7f0688b868..7fe50c29dc 100644 --- a/plugins/doc_fragments/influxdb.py +++ b/plugins/doc_fragments/influxdb.py @@ -7,7 +7,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Parameters for influxdb modules DOCUMENTATION = r""" options: diff --git a/plugins/doc_fragments/ipa.py b/plugins/doc_fragments/ipa.py index 0b740ae8ed..d5ace8d921 100644 --- a/plugins/doc_fragments/ipa.py +++ b/plugins/doc_fragments/ipa.py @@ -7,7 +7,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Parameters for FreeIPA/IPA modules DOCUMENTATION = r""" options: diff --git a/plugins/doc_fragments/keycloak.py b/plugins/doc_fragments/keycloak.py index 2ec693eb99..dd598f8cd9 100644 --- a/plugins/doc_fragments/keycloak.py +++ b/plugins/doc_fragments/keycloak.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/ldap.py b/plugins/doc_fragments/ldap.py index d787bfd65d..abaa92246c 100644 --- a/plugins/doc_fragments/ldap.py +++ b/plugins/doc_fragments/ldap.py @@ -8,7 +8,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard LDAP documentation fragment DOCUMENTATION = r""" notes: diff --git a/plugins/doc_fragments/lxca_common.py b/plugins/doc_fragments/lxca_common.py index 72bc3b7054..f542e283fd 100644 --- a/plugins/doc_fragments/lxca_common.py +++ b/plugins/doc_fragments/lxca_common.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard Pylxca documentation fragment DOCUMENTATION = r""" author: diff --git a/plugins/doc_fragments/manageiq.py b/plugins/doc_fragments/manageiq.py index e7351e4f5e..ecbd9de4e2 100644 --- a/plugins/doc_fragments/manageiq.py +++ b/plugins/doc_fragments/manageiq.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard ManageIQ documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/nomad.py b/plugins/doc_fragments/nomad.py index 37485ef9a7..170e110455 100644 --- a/plugins/doc_fragments/nomad.py +++ b/plugins/doc_fragments/nomad.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard files documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/onepassword.py b/plugins/doc_fragments/onepassword.py index 7a2c7566c3..c57f648945 100644 --- a/plugins/doc_fragments/onepassword.py +++ b/plugins/doc_fragments/onepassword.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" requirements: - See U(https://support.1password.com/command-line/) diff --git a/plugins/doc_fragments/oneview.py b/plugins/doc_fragments/oneview.py index 9e64f02e1a..62bbe7dd1a 100644 --- a/plugins/doc_fragments/oneview.py +++ b/plugins/doc_fragments/oneview.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # OneView doc fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/online.py b/plugins/doc_fragments/online.py index c2b130e7a0..a093be1f44 100644 --- a/plugins/doc_fragments/online.py +++ b/plugins/doc_fragments/online.py @@ -5,7 +5,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/opennebula.py b/plugins/doc_fragments/opennebula.py index 72ccf7d70d..525e034556 100644 --- a/plugins/doc_fragments/opennebula.py +++ b/plugins/doc_fragments/opennebula.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # OpenNebula common documentation DOCUMENTATION = r""" options: diff --git a/plugins/doc_fragments/openswitch.py b/plugins/doc_fragments/openswitch.py index aac90e020f..c2f7269fee 100644 --- a/plugins/doc_fragments/openswitch.py +++ b/plugins/doc_fragments/openswitch.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard files documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/oracle.py b/plugins/doc_fragments/oracle.py index 05120f7aa3..50ff095f0a 100644 --- a/plugins/doc_fragments/oracle.py +++ b/plugins/doc_fragments/oracle.py @@ -11,7 +11,7 @@ from __future__ import annotations # -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" requirements: - Python SDK for Oracle Cloud Infrastructure U(https://oracle-cloud-infrastructure-python-sdk.readthedocs.io) diff --git a/plugins/doc_fragments/oracle_creatable_resource.py b/plugins/doc_fragments/oracle_creatable_resource.py index 1728e56d81..4ff93cbc63 100644 --- a/plugins/doc_fragments/oracle_creatable_resource.py +++ b/plugins/doc_fragments/oracle_creatable_resource.py @@ -11,7 +11,7 @@ from __future__ import annotations # -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: force_create: diff --git a/plugins/doc_fragments/oracle_display_name_option.py b/plugins/doc_fragments/oracle_display_name_option.py index 1ac210bbd4..15954522ef 100644 --- a/plugins/doc_fragments/oracle_display_name_option.py +++ b/plugins/doc_fragments/oracle_display_name_option.py @@ -11,7 +11,7 @@ from __future__ import annotations # -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: display_name: diff --git a/plugins/doc_fragments/oracle_name_option.py b/plugins/doc_fragments/oracle_name_option.py index a281bc5e68..dfb2ef8c27 100644 --- a/plugins/doc_fragments/oracle_name_option.py +++ b/plugins/doc_fragments/oracle_name_option.py @@ -11,7 +11,7 @@ from __future__ import annotations # -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: name: diff --git a/plugins/doc_fragments/oracle_tags.py b/plugins/doc_fragments/oracle_tags.py index ec0096ba33..0891fc8fb4 100644 --- a/plugins/doc_fragments/oracle_tags.py +++ b/plugins/doc_fragments/oracle_tags.py @@ -11,7 +11,7 @@ from __future__ import annotations # -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: defined_tags: diff --git a/plugins/doc_fragments/oracle_wait_options.py b/plugins/doc_fragments/oracle_wait_options.py index 868fb3cb04..16288b3be3 100644 --- a/plugins/doc_fragments/oracle_wait_options.py +++ b/plugins/doc_fragments/oracle_wait_options.py @@ -11,7 +11,7 @@ from __future__ import annotations # -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: wait: diff --git a/plugins/doc_fragments/pipx.py b/plugins/doc_fragments/pipx.py index 70a502ddda..9da3965180 100644 --- a/plugins/doc_fragments/pipx.py +++ b/plugins/doc_fragments/pipx.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: global: diff --git a/plugins/doc_fragments/pritunl.py b/plugins/doc_fragments/pritunl.py index 17e03fc716..24ab62c799 100644 --- a/plugins/doc_fragments/pritunl.py +++ b/plugins/doc_fragments/pritunl.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: diff --git a/plugins/doc_fragments/redfish.py b/plugins/doc_fragments/redfish.py index ed95eeab83..25fe748e4a 100644 --- a/plugins/doc_fragments/redfish.py +++ b/plugins/doc_fragments/redfish.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Use together with the community.general.redfish module utils' REDFISH_COMMON_ARGUMENT_SPEC DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/redis.py b/plugins/doc_fragments/redis.py index 38889a3cbd..6784c86708 100644 --- a/plugins/doc_fragments/redis.py +++ b/plugins/doc_fragments/redis.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Common parameters for Redis modules DOCUMENTATION = r""" options: diff --git a/plugins/doc_fragments/rundeck.py b/plugins/doc_fragments/rundeck.py index 3e9d99aa7a..8642a49ffc 100644 --- a/plugins/doc_fragments/rundeck.py +++ b/plugins/doc_fragments/rundeck.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard files documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/scaleway.py b/plugins/doc_fragments/scaleway.py index 7810deb901..bfef59edae 100644 --- a/plugins/doc_fragments/scaleway.py +++ b/plugins/doc_fragments/scaleway.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/scaleway_waitable_resource.py b/plugins/doc_fragments/scaleway_waitable_resource.py index 2a14c7571e..009a300f70 100644 --- a/plugins/doc_fragments/scaleway_waitable_resource.py +++ b/plugins/doc_fragments/scaleway_waitable_resource.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/utm.py b/plugins/doc_fragments/utm.py index 831f4ccc96..fa52dc87a8 100644 --- a/plugins/doc_fragments/utm.py +++ b/plugins/doc_fragments/utm.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: headers: diff --git a/plugins/doc_fragments/vexata.py b/plugins/doc_fragments/vexata.py index 3ca6684469..7d07183bb7 100644 --- a/plugins/doc_fragments/vexata.py +++ b/plugins/doc_fragments/vexata.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Documentation fragment for Vexata VX100 series VX100 = r''' diff --git a/plugins/doc_fragments/xenserver.py b/plugins/doc_fragments/xenserver.py index 7da1391420..89c6b0548c 100644 --- a/plugins/doc_fragments/xenserver.py +++ b/plugins/doc_fragments/xenserver.py @@ -6,7 +6,7 @@ from __future__ import annotations -class ModuleDocFragment(object): +class ModuleDocFragment: # Common parameters for XenServer modules DOCUMENTATION = r""" options: diff --git a/plugins/filter/accumulate.py b/plugins/filter/accumulate.py index da784ab12b..bd2f5ae932 100644 --- a/plugins/filter/accumulate.py +++ b/plugins/filter/accumulate.py @@ -54,7 +54,7 @@ def list_accumulate(sequence): return accumulate(sequence) -class FilterModule(object): +class FilterModule: def filters(self): return { diff --git a/plugins/filter/counter.py b/plugins/filter/counter.py index f89bfd6d1a..7830baa5b5 100644 --- a/plugins/filter/counter.py +++ b/plugins/filter/counter.py @@ -53,7 +53,7 @@ def counter(sequence): return result -class FilterModule(object): +class FilterModule: ''' Ansible counter jinja2 filters ''' def filters(self): diff --git a/plugins/filter/dict.py b/plugins/filter/dict.py index d2d8bb952c..193871d585 100644 --- a/plugins/filter/dict.py +++ b/plugins/filter/dict.py @@ -68,7 +68,7 @@ def dict_filter(sequence): return dict(sequence) -class FilterModule(object): +class FilterModule: '''Ansible jinja2 filters''' def filters(self): diff --git a/plugins/filter/dict_kv.py b/plugins/filter/dict_kv.py index 79c8dd0fe6..a8f418d38f 100644 --- a/plugins/filter/dict_kv.py +++ b/plugins/filter/dict_kv.py @@ -93,7 +93,7 @@ def dict_kv(value, key): return {key: value} -class FilterModule(object): +class FilterModule: ''' Query filter ''' def filters(self): diff --git a/plugins/filter/from_csv.py b/plugins/filter/from_csv.py index 160eed959e..b57a5a07a4 100644 --- a/plugins/filter/from_csv.py +++ b/plugins/filter/from_csv.py @@ -111,7 +111,7 @@ def from_csv(data, dialect='excel', fieldnames=None, delimiter=None, skipinitial return data_list -class FilterModule(object): +class FilterModule: def filters(self): return { diff --git a/plugins/filter/from_ini.py b/plugins/filter/from_ini.py index 07b16d4ac2..52112d56d4 100644 --- a/plugins/filter/from_ini.py +++ b/plugins/filter/from_ini.py @@ -85,7 +85,7 @@ def from_ini(obj): return parser.as_dict() -class FilterModule(object): +class FilterModule: ''' Query filter ''' def filters(self): diff --git a/plugins/filter/groupby_as_dict.py b/plugins/filter/groupby_as_dict.py index 766d365575..fc174da0d9 100644 --- a/plugins/filter/groupby_as_dict.py +++ b/plugins/filter/groupby_as_dict.py @@ -80,7 +80,7 @@ def groupby_as_dict(sequence, attribute): return result -class FilterModule(object): +class FilterModule: ''' Ansible list filters ''' def filters(self): diff --git a/plugins/filter/hashids.py b/plugins/filter/hashids.py index 3ea758213a..0f76505b2a 100644 --- a/plugins/filter/hashids.py +++ b/plugins/filter/hashids.py @@ -89,7 +89,7 @@ def hashids_decode(hashid, salt=None, alphabet=None, min_length=None): return list(nums) -class FilterModule(object): +class FilterModule: def filters(self): return { diff --git a/plugins/filter/jc.py b/plugins/filter/jc.py index 92996e812c..d4edb16e4b 100644 --- a/plugins/filter/jc.py +++ b/plugins/filter/jc.py @@ -149,7 +149,7 @@ def jc_filter(data, parser, quiet=True, raw=False): raise AnsibleFilterError(f'Error in jc filter plugin: {e}') -class FilterModule(object): +class FilterModule: ''' Query filter ''' def filters(self): diff --git a/plugins/filter/json_query.py b/plugins/filter/json_query.py index e040a4aca2..320258ed52 100644 --- a/plugins/filter/json_query.py +++ b/plugins/filter/json_query.py @@ -143,7 +143,7 @@ def json_query(data, expr): raise AnsibleFilterError(f'Error in jmespath.search in json_query filter plugin:\n{e}') -class FilterModule(object): +class FilterModule: ''' Query filter ''' def filters(self): diff --git a/plugins/filter/keep_keys.py b/plugins/filter/keep_keys.py index 18876789d6..d1a0ab8319 100644 --- a/plugins/filter/keep_keys.py +++ b/plugins/filter/keep_keys.py @@ -128,7 +128,7 @@ def keep_keys(data, target=None, matching_parameter='equal'): return [{k: v for k, v in d.items() if keep_key(k)} for d in data] -class FilterModule(object): +class FilterModule: def filters(self): return { diff --git a/plugins/filter/lists.py b/plugins/filter/lists.py index 0bae08f24c..9f5652078f 100644 --- a/plugins/filter/lists.py +++ b/plugins/filter/lists.py @@ -188,7 +188,7 @@ def do_symmetric_difference(a, b): return sym_diff -class FilterModule(object): +class FilterModule: ''' Ansible lists jinja2 filters ''' def filters(self): diff --git a/plugins/filter/lists_mergeby.py b/plugins/filter/lists_mergeby.py index 4b8bf971f4..1b49cbefaa 100644 --- a/plugins/filter/lists_mergeby.py +++ b/plugins/filter/lists_mergeby.py @@ -268,7 +268,7 @@ def lists_mergeby(*terms, **kwargs): return result -class FilterModule(object): +class FilterModule: ''' Ansible list filters ''' def filters(self): diff --git a/plugins/filter/remove_keys.py b/plugins/filter/remove_keys.py index fc134b41d0..d498418ec0 100644 --- a/plugins/filter/remove_keys.py +++ b/plugins/filter/remove_keys.py @@ -128,7 +128,7 @@ def remove_keys(data, target=None, matching_parameter='equal'): return [{k: v for k, v in d.items() if keep_key(k)} for d in data] -class FilterModule(object): +class FilterModule: def filters(self): return { diff --git a/plugins/filter/replace_keys.py b/plugins/filter/replace_keys.py index 5af0b22f62..887d00ab9f 100644 --- a/plugins/filter/replace_keys.py +++ b/plugins/filter/replace_keys.py @@ -170,7 +170,7 @@ def replace_keys(data, target=None, matching_parameter='equal'): return [{replace_key(k): v for k, v in d.items()} for d in data] -class FilterModule(object): +class FilterModule: def filters(self): return { diff --git a/plugins/filter/reveal_ansible_type.py b/plugins/filter/reveal_ansible_type.py index e068702355..718bc0c750 100644 --- a/plugins/filter/reveal_ansible_type.py +++ b/plugins/filter/reveal_ansible_type.py @@ -139,7 +139,7 @@ def reveal_ansible_type(data, alias=None): return _ansible_type(data, alias) -class FilterModule(object): +class FilterModule: def filters(self): return { diff --git a/plugins/filter/time.py b/plugins/filter/time.py index e48e24216a..3c1bcf7c88 100644 --- a/plugins/filter/time.py +++ b/plugins/filter/time.py @@ -128,7 +128,7 @@ def to_years(human_time, **kwargs): return to_time_unit(human_time, 'y', **kwargs) -class FilterModule(object): +class FilterModule: ''' Ansible time jinja2 filters ''' def filters(self): diff --git a/plugins/filter/to_ini.py b/plugins/filter/to_ini.py index a70740b8aa..718dc3b886 100644 --- a/plugins/filter/to_ini.py +++ b/plugins/filter/to_ini.py @@ -90,7 +90,7 @@ def to_ini(obj): return ''.join(config.getvalue().rsplit(config.getvalue()[-1], 1)) -class FilterModule(object): +class FilterModule: ''' Query filter ''' def filters(self): diff --git a/plugins/filter/to_prettytable.py b/plugins/filter/to_prettytable.py index 266a426cf2..154944a452 100644 --- a/plugins/filter/to_prettytable.py +++ b/plugins/filter/to_prettytable.py @@ -400,7 +400,7 @@ def to_prettytable(data, *args, **kwargs): return to_text(table) -class FilterModule(object): +class FilterModule: """Ansible core jinja2 filters.""" def filters(self): diff --git a/plugins/filter/to_yaml.py b/plugins/filter/to_yaml.py index f808a9420c..82e3f5cfa0 100644 --- a/plugins/filter/to_yaml.py +++ b/plugins/filter/to_yaml.py @@ -106,7 +106,7 @@ def to_nice_yaml(value: t.Any, *, redact_sensitive_values: bool = False, indent: ) -class FilterModule(object): +class FilterModule: def filters(self): return { 'to_yaml': to_yaml, diff --git a/plugins/filter/unicode_normalize.py b/plugins/filter/unicode_normalize.py index 7298246916..410ae76335 100644 --- a/plugins/filter/unicode_normalize.py +++ b/plugins/filter/unicode_normalize.py @@ -76,7 +76,7 @@ def unicode_normalize(data, form='NFC'): return normalize(form, data) -class FilterModule(object): +class FilterModule: def filters(self): return { 'unicode_normalize': unicode_normalize, diff --git a/plugins/filter/version_sort.py b/plugins/filter/version_sort.py index 893c7e5bd3..fc3f5e0176 100644 --- a/plugins/filter/version_sort.py +++ b/plugins/filter/version_sort.py @@ -41,7 +41,7 @@ def version_sort(value, reverse=False): return sorted(value, key=LooseVersion, reverse=reverse) -class FilterModule(object): +class FilterModule: ''' Version sort filter ''' def filters(self): diff --git a/plugins/lookup/bitwarden.py b/plugins/lookup/bitwarden.py index 60d11c8bfb..24608ec10b 100644 --- a/plugins/lookup/bitwarden.py +++ b/plugins/lookup/bitwarden.py @@ -130,7 +130,7 @@ class BitwardenException(AnsibleError): pass -class Bitwarden(object): +class Bitwarden: def __init__(self, path='bw'): self._cli_path = path diff --git a/plugins/lookup/bitwarden_secrets_manager.py b/plugins/lookup/bitwarden_secrets_manager.py index 0227c16bae..173467047a 100644 --- a/plugins/lookup/bitwarden_secrets_manager.py +++ b/plugins/lookup/bitwarden_secrets_manager.py @@ -82,7 +82,7 @@ class BitwardenSecretsManagerException(AnsibleLookupError): pass -class BitwardenSecretsManager(object): +class BitwardenSecretsManager: def __init__(self, path='bws'): self._cli_path = path self._max_retries = 3 diff --git a/plugins/lookup/hiera.py b/plugins/lookup/hiera.py index d031987a81..ce7e78e851 100644 --- a/plugins/lookup/hiera.py +++ b/plugins/lookup/hiera.py @@ -72,7 +72,7 @@ from ansible.utils.cmd_functions import run_cmd from ansible.module_utils.common.text.converters import to_text -class Hiera(object): +class Hiera: def __init__(self, hiera_cfg, hiera_bin): self.hiera_cfg = hiera_cfg self.hiera_bin = hiera_bin diff --git a/plugins/lookup/lastpass.py b/plugins/lookup/lastpass.py index 8a3999c372..f55346ff13 100644 --- a/plugins/lookup/lastpass.py +++ b/plugins/lookup/lastpass.py @@ -50,7 +50,7 @@ class LPassException(AnsibleError): pass -class LPass(object): +class LPass: def __init__(self, path='lpass'): self._cli_path = path diff --git a/plugins/lookup/onepassword.py b/plugins/lookup/onepassword.py index 5cd8bf6f0e..773b1d273c 100644 --- a/plugins/lookup/onepassword.py +++ b/plugins/lookup/onepassword.py @@ -95,7 +95,7 @@ def _lower_if_possible(value): return value -class OnePassCLIBase(object, metaclass=abc.ABCMeta): +class OnePassCLIBase(metaclass=abc.ABCMeta): bin = "op" def __init__( @@ -583,7 +583,7 @@ class OnePassCLIv2(OnePassCLIBase): return self._run(args, command_input=to_bytes(self.master_password)) -class OnePass(object): +class OnePass: def __init__(self, subdomain=None, domain="1password.com", username=None, secret_key=None, master_password=None, service_account_token=None, account_id=None, connect_host=None, connect_token=None, cli_class=None): self.subdomain = subdomain diff --git a/plugins/lookup/tss.py b/plugins/lookup/tss.py index e612446374..ba819bab4c 100644 --- a/plugins/lookup/tss.py +++ b/plugins/lookup/tss.py @@ -286,7 +286,7 @@ except ImportError: display = Display() -class TSSClient(object, metaclass=abc.ABCMeta): +class TSSClient(metaclass=abc.ABCMeta): # noqa: B024 def __init__(self): self._client = None diff --git a/plugins/module_utils/_stormssh.py b/plugins/module_utils/_stormssh.py index 92cd44026b..8c1188d540 100644 --- a/plugins/module_utils/_stormssh.py +++ b/plugins/module_utils/_stormssh.py @@ -92,7 +92,7 @@ class StormConfig(SSHConfig): self._config.append(host) -class ConfigParser(object): +class ConfigParser: """ Config parser for ~/.ssh/config files. """ diff --git a/plugins/module_utils/android_sdkmanager.py b/plugins/module_utils/android_sdkmanager.py index b25a1a04fc..ab086cc66e 100644 --- a/plugins/module_utils/android_sdkmanager.py +++ b/plugins/module_utils/android_sdkmanager.py @@ -71,7 +71,7 @@ class SdkManagerException(Exception): pass -class AndroidSdkManager(object): +class AndroidSdkManager: _RE_INSTALLED_PACKAGES_HEADER = re.compile(r'^Installed packages:$') _RE_UPDATABLE_PACKAGES_HEADER = re.compile(r'^Available Updates:$') diff --git a/plugins/module_utils/btrfs.py b/plugins/module_utils/btrfs.py index 3c9ad3b382..b0470eac13 100644 --- a/plugins/module_utils/btrfs.py +++ b/plugins/module_utils/btrfs.py @@ -23,7 +23,7 @@ class BtrfsModuleException(Exception): pass -class BtrfsCommands(object): +class BtrfsCommands: """ Provides access to a subset of the Btrfs command line @@ -102,7 +102,7 @@ class BtrfsCommands(object): result = self.__module.run_command(command, check_rc=True) -class BtrfsInfoProvider(object): +class BtrfsInfoProvider: """ Utility providing details of the currently available btrfs filesystems @@ -174,7 +174,7 @@ class BtrfsInfoProvider(object): raise BtrfsModuleException(f"Failed to find subvolid for mountpoint in options '{mount_options}'") -class BtrfsSubvolume(object): +class BtrfsSubvolume: """ Wrapper class providing convenience methods for inspection of a btrfs subvolume @@ -252,7 +252,7 @@ class BtrfsSubvolume(object): return self.__info['parent'] -class BtrfsFilesystem(object): +class BtrfsFilesystem: """ Wrapper class providing convenience methods for inspection of a btrfs filesystem @@ -411,7 +411,7 @@ class BtrfsFilesystem(object): } -class BtrfsFilesystemsProvider(object): +class BtrfsFilesystemsProvider: """ Provides methods to query available btrfs filesystems diff --git a/plugins/module_utils/cloud.py b/plugins/module_utils/cloud.py index c8043a8d9e..d3569472db 100644 --- a/plugins/module_utils/cloud.py +++ b/plugins/module_utils/cloud.py @@ -89,7 +89,7 @@ def _full_jitter_backoff(retries=10, delay=3, max_delay=60, _random=random): return backoff_gen -class CloudRetry(object): +class CloudRetry: """ CloudRetry can be used by any cloud provider, in order to implement a backoff algorithm/retry effect based on Status Code from Exceptions. """ diff --git a/plugins/module_utils/cmd_runner.py b/plugins/module_utils/cmd_runner.py index b4903e1452..aa7c395fea 100644 --- a/plugins/module_utils/cmd_runner.py +++ b/plugins/module_utils/cmd_runner.py @@ -63,7 +63,7 @@ class FormatError(CmdRunnerException): return f"Failed to format parameter {self.name} with value {self.value}: {self.exc}" -class CmdRunner(object): +class CmdRunner: """ Wrapper for ``AnsibleModule.run_command()``. @@ -129,7 +129,7 @@ class CmdRunner(object): context = __call__ -class _CmdRunnerContext(object): +class _CmdRunnerContext: def __init__(self, runner, args_order, output_process, check_mode_skip, check_mode_return, **kwargs): self.runner = runner self.args_order = tuple(args_order) diff --git a/plugins/module_utils/cmd_runner_fmt.py b/plugins/module_utils/cmd_runner_fmt.py index 8f00b5ea96..b0b27f13fe 100644 --- a/plugins/module_utils/cmd_runner_fmt.py +++ b/plugins/module_utils/cmd_runner_fmt.py @@ -20,7 +20,7 @@ def _ensure_list(value): return list(value) if is_sequence(value) else [value] -class _ArgFormat(object): +class _ArgFormat: def __init__(self, func, ignore_none=True, ignore_missing_value=False): self.func = func self.ignore_none = ignore_none diff --git a/plugins/module_utils/deps.py b/plugins/module_utils/deps.py index a24cd63838..c8fdf876bb 100644 --- a/plugins/module_utils/deps.py +++ b/plugins/module_utils/deps.py @@ -16,7 +16,7 @@ from ansible.module_utils.basic import missing_required_lib _deps = dict() -class _Dependency(object): +class _Dependency: _states = ["pending", "failure", "success"] def __init__(self, name, reason=None, url=None, msg=None): diff --git a/plugins/module_utils/dimensiondata.py b/plugins/module_utils/dimensiondata.py index 2b82e62342..4964dc500b 100644 --- a/plugins/module_utils/dimensiondata.py +++ b/plugins/module_utils/dimensiondata.py @@ -52,7 +52,7 @@ except ImportError: MCP_2_LOCATION_NAME_PATTERN = re.compile(r".*MCP\s?2.*") -class DimensionDataModule(object): +class DimensionDataModule: """ The base class containing common functionality used by Dimension Data modules for Ansible. """ diff --git a/plugins/module_utils/gandi_livedns_api.py b/plugins/module_utils/gandi_livedns_api.py index 135fc6188c..948d2309d8 100644 --- a/plugins/module_utils/gandi_livedns_api.py +++ b/plugins/module_utils/gandi_livedns_api.py @@ -10,7 +10,7 @@ from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.urls import fetch_url -class GandiLiveDNSAPI(object): +class GandiLiveDNSAPI: api_endpoint = 'https://api.gandi.net/v5/livedns' changed = False diff --git a/plugins/module_utils/homebrew.py b/plugins/module_utils/homebrew.py index 88e92461c3..5747dc57c0 100644 --- a/plugins/module_utils/homebrew.py +++ b/plugins/module_utils/homebrew.py @@ -16,7 +16,7 @@ def _create_regex_group_complement(s): return re.compile(group) -class HomebrewValidate(object): +class HomebrewValidate: # class regexes ------------------------------------------------ {{{ VALID_PATH_CHARS = rf""" \w # alphanumeric characters (i.e., [a-zA-Z0-9_]) diff --git a/plugins/module_utils/hwc_utils.py b/plugins/module_utils/hwc_utils.py index 596303527c..5d01602735 100644 --- a/plugins/module_utils/hwc_utils.py +++ b/plugins/module_utils/hwc_utils.py @@ -92,7 +92,7 @@ def session_method_wrapper(f): return _wrap -class _ServiceClient(object): +class _ServiceClient: def __init__(self, client, endpoint, product): self._client = client self._endpoint = endpoint @@ -140,7 +140,7 @@ class _ServiceClient(object): return header -class Config(object): +class Config: def __init__(self, module, product): self._project_client = None self._domain_client = None @@ -252,7 +252,7 @@ class HwcModule(AnsibleModule): super(HwcModule, self).__init__(*args, **kwargs) -class _DictComparison(object): +class _DictComparison: ''' This class takes in two dictionaries `a` and `b`. These are dictionaries of arbitrary depth, but made up of standard Python types only. diff --git a/plugins/module_utils/identity/keycloak/keycloak.py b/plugins/module_utils/identity/keycloak/keycloak.py index a54a911c20..53127d60c4 100644 --- a/plugins/module_utils/identity/keycloak/keycloak.py +++ b/plugins/module_utils/identity/keycloak/keycloak.py @@ -350,7 +350,7 @@ def is_struct_included(struct1, struct2, exclude=None): return to_text(struct1, 'utf-8') == to_text(struct2, 'utf-8') -class KeycloakAPI(object): +class KeycloakAPI: """ Keycloak API access; Keycloak uses OAuth 2.0 to protect its API, an access token for which is obtained through OpenID connect """ diff --git a/plugins/module_utils/ipa.py b/plugins/module_utils/ipa.py index 96010d503b..6141680c74 100644 --- a/plugins/module_utils/ipa.py +++ b/plugins/module_utils/ipa.py @@ -40,7 +40,7 @@ def _env_then_dns_fallback(*args, **kwargs): raise AnsibleFallbackNotFound -class IPAClient(object): +class IPAClient: def __init__(self, module, host, port, protocol): self.host = host self.port = port diff --git a/plugins/module_utils/ldap.py b/plugins/module_utils/ldap.py index e0ee5940e2..cca92958d8 100644 --- a/plugins/module_utils/ldap.py +++ b/plugins/module_utils/ldap.py @@ -51,7 +51,7 @@ def ldap_required_together(): return [['client_cert', 'client_key']] -class LdapGeneric(object): +class LdapGeneric: def __init__(self, module): # Shortcuts self.module = module diff --git a/plugins/module_utils/lxd.py b/plugins/module_utils/lxd.py index cc8e05c0f0..364c4f85d2 100644 --- a/plugins/module_utils/lxd.py +++ b/plugins/module_utils/lxd.py @@ -38,7 +38,7 @@ class LXDClientException(Exception): self.kwargs = kwargs -class LXDClient(object): +class LXDClient: def __init__(self, url, key_file=None, cert_file=None, debug=False, server_cert_file=None, server_check_hostname=True): """LXD Client. diff --git a/plugins/module_utils/manageiq.py b/plugins/module_utils/manageiq.py index 4b89fd78cc..56b031aad7 100644 --- a/plugins/module_utils/manageiq.py +++ b/plugins/module_utils/manageiq.py @@ -74,7 +74,7 @@ def manageiq_entities(): } -class ManageIQ(object): +class ManageIQ: """ class encapsulating ManageIQ API client. """ @@ -177,7 +177,7 @@ class ManageIQ(object): self.module.fail_json(msg=msg) -class ManageIQPolicies(object): +class ManageIQPolicies: """ Object to execute policies management operations of manageiq resources. """ @@ -329,7 +329,7 @@ class ManageIQPolicies(object): msg=f"Successfully {action}ed profiles: {profiles}") -class ManageIQTags(object): +class ManageIQTags: """ Object to execute tags management operations of manageiq resources. """ diff --git a/plugins/module_utils/memset.py b/plugins/module_utils/memset.py index cbfbc9108a..0156f5b8fe 100644 --- a/plugins/module_utils/memset.py +++ b/plugins/module_utils/memset.py @@ -17,7 +17,7 @@ from ansible.module_utils.basic import json import urllib.error as urllib_error -class Response(object): +class Response: ''' Create a response object to mimic that of requests. ''' diff --git a/plugins/module_utils/mh/base.py b/plugins/module_utils/mh/base.py index a1cd889eaf..85682b9f62 100644 --- a/plugins/module_utils/mh/base.py +++ b/plugins/module_utils/mh/base.py @@ -12,7 +12,7 @@ from ansible_collections.community.general.plugins.module_utils.mh.exceptions im from ansible_collections.community.general.plugins.module_utils.mh.deco import module_fails_on_exception -class ModuleHelperBase(object): +class ModuleHelperBase: module: dict[str, t.Any] | None = None # TODO: better spec using t.TypedDict ModuleHelperException = _MHE _delegated_to_module: tuple[str, ...] = ( diff --git a/plugins/module_utils/mh/mixins/deprecate_attrs.py b/plugins/module_utils/mh/mixins/deprecate_attrs.py index 166e365782..539af92383 100644 --- a/plugins/module_utils/mh/mixins/deprecate_attrs.py +++ b/plugins/module_utils/mh/mixins/deprecate_attrs.py @@ -9,7 +9,7 @@ from __future__ import annotations from ansible.module_utils.basic import AnsibleModule -class DeprecateAttrsMixin(object): +class DeprecateAttrsMixin: def _deprecate_setup(self, attr, target, module): if target is None: diff --git a/plugins/module_utils/mh/mixins/state.py b/plugins/module_utils/mh/mixins/state.py index ef9b074005..50cce4743f 100644 --- a/plugins/module_utils/mh/mixins/state.py +++ b/plugins/module_utils/mh/mixins/state.py @@ -6,7 +6,7 @@ from __future__ import annotations -class StateMixin(object): +class StateMixin: state_param: str = 'state' default_state: str | None = None diff --git a/plugins/module_utils/ocapi_utils.py b/plugins/module_utils/ocapi_utils.py index fd606d9bcc..f316a3e4c4 100644 --- a/plugins/module_utils/ocapi_utils.py +++ b/plugins/module_utils/ocapi_utils.py @@ -23,7 +23,7 @@ DELETE_HEADERS = {'accept': 'application/json'} HEALTH_OK = 5 -class OcapiUtils(object): +class OcapiUtils: def __init__(self, creds, base_uri, proxy_slot_number, timeout, module): self.root_uri = base_uri diff --git a/plugins/module_utils/onepassword.py b/plugins/module_utils/onepassword.py index 5e52a9af41..6567d4bd1c 100644 --- a/plugins/module_utils/onepassword.py +++ b/plugins/module_utils/onepassword.py @@ -7,7 +7,7 @@ from __future__ import annotations import os -class OnePasswordConfig(object): +class OnePasswordConfig: _config_file_paths = ( "~/.op/config", "~/.config/op/config", diff --git a/plugins/module_utils/oneview.py b/plugins/module_utils/oneview.py index 1f57355f58..6b33f2df77 100644 --- a/plugins/module_utils/oneview.py +++ b/plugins/module_utils/oneview.py @@ -177,7 +177,7 @@ class OneViewModuleResourceNotFound(OneViewModuleException): pass -class OneViewModuleBase(object, metaclass=abc.ABCMeta): +class OneViewModuleBase(metaclass=abc.ABCMeta): MSG_CREATED = 'Resource created successfully.' MSG_UPDATED = 'Resource updated successfully.' MSG_DELETED = 'Resource deleted successfully.' diff --git a/plugins/module_utils/online.py b/plugins/module_utils/online.py index bcd3edf6e3..8bafc7426c 100644 --- a/plugins/module_utils/online.py +++ b/plugins/module_utils/online.py @@ -27,7 +27,7 @@ class OnlineException(Exception): self.message = message -class Response(object): +class Response: def __init__(self, resp, info): self.body = None @@ -55,7 +55,7 @@ class Response(object): return self.status_code in (200, 201, 202, 204) -class Online(object): +class Online: def __init__(self, module): self.module = module diff --git a/plugins/module_utils/redfish_utils.py b/plugins/module_utils/redfish_utils.py index 53cbc3a1b0..20668fa0da 100644 --- a/plugins/module_utils/redfish_utils.py +++ b/plugins/module_utils/redfish_utils.py @@ -47,7 +47,7 @@ REDFISH_COMMON_ARGUMENT_SPEC = { } -class RedfishUtils(object): +class RedfishUtils: def __init__(self, creds, root_uri, timeout, module, resource_id=None, data_modification=False, strip_etag_quotes=False, ciphers=None): diff --git a/plugins/module_utils/redis.py b/plugins/module_utils/redis.py index d3de8e63e9..d09ca0242f 100644 --- a/plugins/module_utils/redis.py +++ b/plugins/module_utils/redis.py @@ -89,7 +89,7 @@ def redis_auth_params(module): return params -class RedisAnsible(object): +class RedisAnsible: '''Base class for Redis module''' def __init__(self, module): diff --git a/plugins/module_utils/scaleway.py b/plugins/module_utils/scaleway.py index c4ad0016ed..6e6e317d64 100644 --- a/plugins/module_utils/scaleway.py +++ b/plugins/module_utils/scaleway.py @@ -95,7 +95,7 @@ def filter_sensitive_attributes(container, attributes): return container -class SecretVariables(object): +class SecretVariables: @staticmethod def ensure_scaleway_secret_package(module): if not HAS_SCALEWAY_SECRET_PACKAGE: @@ -139,7 +139,7 @@ def resource_attributes_should_be_changed(target, wished, verifiable_mutable_att return diff -class Response(object): +class Response: def __init__(self, resp, info): self.body = None @@ -167,7 +167,7 @@ class Response(object): return self.status_code in (200, 201, 202, 204) -class Scaleway(object): +class Scaleway: def __init__(self, module): self.module = module diff --git a/plugins/module_utils/vardict.py b/plugins/module_utils/vardict.py index ccea7d5bb6..ce0b99ee62 100644 --- a/plugins/module_utils/vardict.py +++ b/plugins/module_utils/vardict.py @@ -8,7 +8,7 @@ from __future__ import annotations import copy -class _Variable(object): +class _Variable: NOTHING = object() def __init__(self, diff=False, output=True, change=None, fact=False, verbosity=0): @@ -104,7 +104,7 @@ class _Variable(object): ) -class VarDict(object): +class VarDict: reserved_names = ('__vars__', '_var', 'var', 'set_meta', 'get_meta', 'set', 'output', 'diff', 'facts', 'has_changed', 'as_dict') def __init__(self): diff --git a/plugins/module_utils/xenserver.py b/plugins/module_utils/xenserver.py index 32576000cc..becc9bb109 100644 --- a/plugins/module_utils/xenserver.py +++ b/plugins/module_utils/xenserver.py @@ -756,7 +756,7 @@ def get_xenserver_version(module): return xenserver_version -class XAPI(object): +class XAPI: """Class for XAPI session management.""" _xapi_session = None @@ -820,7 +820,7 @@ class XAPI(object): return cls._xapi_session -class XenServerObject(object): +class XenServerObject: """Base class for all XenServer objects. This class contains active XAPI session reference and common diff --git a/plugins/modules/alerta_customer.py b/plugins/modules/alerta_customer.py index 0fd997a1ae..6b4cfb47cd 100644 --- a/plugins/modules/alerta_customer.py +++ b/plugins/modules/alerta_customer.py @@ -98,7 +98,7 @@ from ansible.module_utils.urls import fetch_url, basic_auth_header from ansible.module_utils.basic import AnsibleModule -class AlertaInterface(object): +class AlertaInterface: def __init__(self, module): self.module = module diff --git a/plugins/modules/alternatives.py b/plugins/modules/alternatives.py index feebdd2b4a..9e7075d3b7 100644 --- a/plugins/modules/alternatives.py +++ b/plugins/modules/alternatives.py @@ -158,7 +158,7 @@ class AlternativeState: return [cls.PRESENT, cls.SELECTED, cls.ABSENT, cls.AUTO] -class AlternativesModule(object): +class AlternativesModule: _UPDATE_ALTERNATIVES = None def __init__(self, module): diff --git a/plugins/modules/apache2_mod_proxy.py b/plugins/modules/apache2_mod_proxy.py index 2bd96307a9..349d2c63a4 100644 --- a/plugins/modules/apache2_mod_proxy.py +++ b/plugins/modules/apache2_mod_proxy.py @@ -236,7 +236,7 @@ def regexp_extraction(string, _regexp, groups=1): return None -class BalancerMember(object): +class BalancerMember: """ Apache 2.4 mod_proxy LB balancer member. attributes: read-only: @@ -322,7 +322,7 @@ class BalancerMember(object): } -class Balancer(object): +class Balancer: """ Apache httpd 2.4 mod_proxy balancer object""" def __init__(self, module, host, suffix, tls=False): diff --git a/plugins/modules/archive.py b/plugins/modules/archive.py index 710a1c8fa6..129e621dca 100644 --- a/plugins/modules/archive.py +++ b/plugins/modules/archive.py @@ -246,7 +246,7 @@ def _to_native_ascii(s): return to_native(s, errors='surrogate_or_strict', encoding='ascii') -class Archive(object, metaclass=abc.ABCMeta): +class Archive(metaclass=abc.ABCMeta): def __init__(self, module): self.module = module diff --git a/plugins/modules/beadm.py b/plugins/modules/beadm.py index 3fa9e0b4cc..91128ff686 100644 --- a/plugins/modules/beadm.py +++ b/plugins/modules/beadm.py @@ -142,7 +142,7 @@ import os from ansible.module_utils.basic import AnsibleModule -class BE(object): +class BE: def __init__(self, module): self.module = module diff --git a/plugins/modules/bower.py b/plugins/modules/bower.py index c1959fe74e..7dc45e2530 100644 --- a/plugins/modules/bower.py +++ b/plugins/modules/bower.py @@ -96,7 +96,7 @@ import os from ansible.module_utils.basic import AnsibleModule -class Bower(object): +class Bower: def __init__(self, module, **kwargs): self.module = module self.name = kwargs['name'] diff --git a/plugins/modules/btrfs_subvolume.py b/plugins/modules/btrfs_subvolume.py index 8b2726d763..28b0f2a129 100644 --- a/plugins/modules/btrfs_subvolume.py +++ b/plugins/modules/btrfs_subvolume.py @@ -211,7 +211,7 @@ import os import tempfile -class BtrfsSubvolumeModule(object): +class BtrfsSubvolumeModule: __BTRFS_ROOT_SUBVOLUME = '/' __BTRFS_ROOT_SUBVOLUME_ID = 5 diff --git a/plugins/modules/bzr.py b/plugins/modules/bzr.py index 3493b9476d..32f3be5b65 100644 --- a/plugins/modules/bzr.py +++ b/plugins/modules/bzr.py @@ -63,7 +63,7 @@ import re from ansible.module_utils.basic import AnsibleModule -class Bzr(object): +class Bzr: def __init__(self, module, parent, dest, version, bzr_path): self.module = module self.parent = parent diff --git a/plugins/modules/capabilities.py b/plugins/modules/capabilities.py index 3ae951994c..a923c15ef5 100644 --- a/plugins/modules/capabilities.py +++ b/plugins/modules/capabilities.py @@ -65,7 +65,7 @@ from ansible.module_utils.basic import AnsibleModule OPS = ('=', '-', '+') -class CapabilitiesModule(object): +class CapabilitiesModule: platform = 'Linux' distribution = None diff --git a/plugins/modules/cargo.py b/plugins/modules/cargo.py index b4805dc8cc..1425a4bf3c 100644 --- a/plugins/modules/cargo.py +++ b/plugins/modules/cargo.py @@ -126,7 +126,7 @@ import re from ansible.module_utils.basic import AnsibleModule -class Cargo(object): +class Cargo: def __init__(self, module, **kwargs): self.module = module self.executable = [kwargs["executable"] or module.get_bin_path("cargo", True)] diff --git a/plugins/modules/cloudflare_dns.py b/plugins/modules/cloudflare_dns.py index 4f775c73f5..e292472fc7 100644 --- a/plugins/modules/cloudflare_dns.py +++ b/plugins/modules/cloudflare_dns.py @@ -453,7 +453,7 @@ def join_str(sep, *args): return sep.join([str(arg) for arg in args]) -class CloudflareAPI(object): +class CloudflareAPI: cf_api_endpoint = 'https://api.cloudflare.com/client/v4' changed = False diff --git a/plugins/modules/consul.py b/plugins/modules/consul.py index 2183b62005..a0f87d3764 100644 --- a/plugins/modules/consul.py +++ b/plugins/modules/consul.py @@ -395,7 +395,7 @@ def parse_service(module): ) -class ConsulService(object): +class ConsulService: def __init__(self, service_id=None, name=None, address=None, port=-1, tags=None, loaded=None): @@ -458,7 +458,7 @@ class ConsulService(object): return data -class ConsulCheck(object): +class ConsulCheck: def __init__(self, check_id, name, node=None, host='localhost', script=None, interval=None, ttl=None, notes=None, tcp=None, http=None, timeout=None, service_id=None): diff --git a/plugins/modules/copr.py b/plugins/modules/copr.py index 24832a59f8..36f6e7539f 100644 --- a/plugins/modules/copr.py +++ b/plugins/modules/copr.py @@ -134,7 +134,7 @@ def _respawn_dnf(): respawn.respawn_module(interpreter) -class CoprModule(object): +class CoprModule: """The class represents a copr module. The class contains methods that take care of the repository state of a project, diff --git a/plugins/modules/cronvar.py b/plugins/modules/cronvar.py index 1d70d9d848..cd15ae2585 100644 --- a/plugins/modules/cronvar.py +++ b/plugins/modules/cronvar.py @@ -112,7 +112,7 @@ class CronVarError(Exception): pass -class CronVar(object): +class CronVar: """ CronVar object to write variables to crontabs. diff --git a/plugins/modules/crypttab.py b/plugins/modules/crypttab.py index fe37e83b27..862fc2c503 100644 --- a/plugins/modules/crypttab.py +++ b/plugins/modules/crypttab.py @@ -165,7 +165,7 @@ def main(): module.exit_json(changed=changed, msg=reason, **module.params) -class Crypttab(object): +class Crypttab: _lines: list[str] def __init__(self, path): @@ -207,7 +207,7 @@ class Crypttab(object): return crypttab -class Line(object): +class Line: def __init__(self, line=None, name=None, backing_device=None, password=None, opts=None): self.line = line self.name = name diff --git a/plugins/modules/dconf.py b/plugins/modules/dconf.py index e456288ae5..8eb487c383 100644 --- a/plugins/modules/dconf.py +++ b/plugins/modules/dconf.py @@ -147,7 +147,7 @@ with deps.declare("psutil"): import psutil -class DBusWrapper(object): +class DBusWrapper: """ Helper class that can be used for running a command with a working D-Bus session. @@ -248,7 +248,7 @@ class DBusWrapper(object): return rc, out, err -class DconfPreference(object): +class DconfPreference: def __init__(self, module, check_mode=False): """ diff --git a/plugins/modules/deploy_helper.py b/plugins/modules/deploy_helper.py index f99f514e6e..2629d59d30 100644 --- a/plugins/modules/deploy_helper.py +++ b/plugins/modules/deploy_helper.py @@ -271,7 +271,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -class DeployHelper(object): +class DeployHelper: def __init__(self, module): self.module = module diff --git a/plugins/modules/dimensiondata_vlan.py b/plugins/modules/dimensiondata_vlan.py index ab6a30deb8..84699e4f3b 100644 --- a/plugins/modules/dimensiondata_vlan.py +++ b/plugins/modules/dimensiondata_vlan.py @@ -460,7 +460,7 @@ class InvalidVlanChangeError(Exception): pass -class VlanDiff(object): +class VlanDiff: """ Represents differences between VLAN information (from CloudControl) and module parameters. """ diff --git a/plugins/modules/dnsmadeeasy.py b/plugins/modules/dnsmadeeasy.py index c2106f77af..0549325f47 100644 --- a/plugins/modules/dnsmadeeasy.py +++ b/plugins/modules/dnsmadeeasy.py @@ -367,7 +367,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -class DME2(object): +class DME2: def __init__(self, apikey, secret, domain, sandbox, module): self.module = module diff --git a/plugins/modules/ejabberd_user.py b/plugins/modules/ejabberd_user.py index 6e3337c0b2..240f123fd9 100644 --- a/plugins/modules/ejabberd_user.py +++ b/plugins/modules/ejabberd_user.py @@ -70,7 +70,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -class EjabberdUser(object): +class EjabberdUser: """ This object represents a user resource for an ejabberd server. The object manages user creation and deletion using ejabberdctl. The following commands are currently supported: diff --git a/plugins/modules/filesystem.py b/plugins/modules/filesystem.py index 7d0b128fb5..a25ecfd616 100644 --- a/plugins/modules/filesystem.py +++ b/plugins/modules/filesystem.py @@ -158,7 +158,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.version import LooseVersion -class Device(object): +class Device: def __init__(self, module, path): self.module = module self.path = path @@ -199,7 +199,7 @@ class Device(object): return self.path -class Filesystem(object): +class Filesystem: MKFS: str | None = None MKFS_FORCE_FLAGS: list[str] | None = [] diff --git a/plugins/modules/github_deploy_key.py b/plugins/modules/github_deploy_key.py index 70e90225f3..8f72e324a4 100644 --- a/plugins/modules/github_deploy_key.py +++ b/plugins/modules/github_deploy_key.py @@ -184,7 +184,7 @@ from ansible.module_utils.urls import fetch_url from re import findall -class GithubDeployKey(object): +class GithubDeployKey: def __init__(self, module): self.module = module diff --git a/plugins/modules/github_key.py b/plugins/modules/github_key.py index 3f69554a21..e76f9c47f9 100644 --- a/plugins/modules/github_key.py +++ b/plugins/modules/github_key.py @@ -140,7 +140,7 @@ from ansible_collections.community.general.plugins.module_utils.datetime import ) -class GitHubResponse(object): +class GitHubResponse: def __init__(self, response, info): self.content = response.read() self.info = info @@ -158,7 +158,7 @@ class GitHubResponse(object): return links -class GitHubSession(object): +class GitHubSession: def __init__(self, module, token, api_url): self.module = module self.token = token diff --git a/plugins/modules/gitlab_branch.py b/plugins/modules/gitlab_branch.py index eb4d73d9e4..a44093ba18 100644 --- a/plugins/modules/gitlab_branch.py +++ b/plugins/modules/gitlab_branch.py @@ -84,7 +84,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitlabBranch(object): +class GitlabBranch: def __init__(self, module, project, gitlab_instance): self.repo = gitlab_instance diff --git a/plugins/modules/gitlab_deploy_key.py b/plugins/modules/gitlab_deploy_key.py index 9c84f49c48..b5ea900f79 100644 --- a/plugins/modules/gitlab_deploy_key.py +++ b/plugins/modules/gitlab_deploy_key.py @@ -120,7 +120,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitLabDeployKey(object): +class GitLabDeployKey: def __init__(self, module, gitlab_instance): self._module = module self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_group.py b/plugins/modules/gitlab_group.py index a575587bad..02c01511af 100644 --- a/plugins/modules/gitlab_group.py +++ b/plugins/modules/gitlab_group.py @@ -252,7 +252,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitLabGroup(object): +class GitLabGroup: def __init__(self, module, gitlab_instance): self._module = module self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_group_access_token.py b/plugins/modules/gitlab_group_access_token.py index 4c8d02383c..2c430c1603 100644 --- a/plugins/modules/gitlab_group_access_token.py +++ b/plugins/modules/gitlab_group_access_token.py @@ -166,7 +166,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ACCESS_LEVELS = dict(guest=10, planner=15, reporter=20, developer=30, maintainer=40, owner=50) -class GitLabGroupAccessToken(object): +class GitLabGroupAccessToken: def __init__(self, module, gitlab_instance): self._module = module self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_group_members.py b/plugins/modules/gitlab_group_members.py index 113285ed90..7c9e8ac464 100644 --- a/plugins/modules/gitlab_group_members.py +++ b/plugins/modules/gitlab_group_members.py @@ -161,7 +161,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitLabGroup(object): +class GitLabGroup: def __init__(self, module, gl): self._module = module self._gitlab = gl diff --git a/plugins/modules/gitlab_group_variable.py b/plugins/modules/gitlab_group_variable.py index c505547d87..3fa1343c21 100644 --- a/plugins/modules/gitlab_group_variable.py +++ b/plugins/modules/gitlab_group_variable.py @@ -225,7 +225,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitlabGroupVariables(object): +class GitlabGroupVariables: def __init__(self, module, gitlab_instance): self.repo = gitlab_instance diff --git a/plugins/modules/gitlab_hook.py b/plugins/modules/gitlab_hook.py index a967ae4a10..43101c1c2e 100644 --- a/plugins/modules/gitlab_hook.py +++ b/plugins/modules/gitlab_hook.py @@ -175,7 +175,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitLabHook(object): +class GitLabHook: def __init__(self, module, gitlab_instance): self._module = module self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_instance_variable.py b/plugins/modules/gitlab_instance_variable.py index c7075f7454..25eacf3db8 100644 --- a/plugins/modules/gitlab_instance_variable.py +++ b/plugins/modules/gitlab_instance_variable.py @@ -154,7 +154,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitlabInstanceVariables(object): +class GitlabInstanceVariables: def __init__(self, module, gitlab_instance): self.instance = gitlab_instance diff --git a/plugins/modules/gitlab_issue.py b/plugins/modules/gitlab_issue.py index 0bc5a4a484..dc522aa2cf 100644 --- a/plugins/modules/gitlab_issue.py +++ b/plugins/modules/gitlab_issue.py @@ -146,7 +146,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitlabIssue(object): +class GitlabIssue: def __init__(self, module, project, gitlab_instance): self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_label.py b/plugins/modules/gitlab_label.py index 71dce5885d..30640cf28f 100644 --- a/plugins/modules/gitlab_label.py +++ b/plugins/modules/gitlab_label.py @@ -225,7 +225,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitlabLabels(object): +class GitlabLabels: def __init__(self, module, gitlab_instance, group_id, project_id): self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_merge_request.py b/plugins/modules/gitlab_merge_request.py index cda72ebe24..7b48d28539 100644 --- a/plugins/modules/gitlab_merge_request.py +++ b/plugins/modules/gitlab_merge_request.py @@ -152,7 +152,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitlabMergeRequest(object): +class GitlabMergeRequest: def __init__(self, module, project, gitlab_instance): self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_milestone.py b/plugins/modules/gitlab_milestone.py index 412891970d..616cdbde5b 100644 --- a/plugins/modules/gitlab_milestone.py +++ b/plugins/modules/gitlab_milestone.py @@ -210,7 +210,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( from datetime import datetime -class GitlabMilestones(object): +class GitlabMilestones: def __init__(self, module, gitlab_instance, group_id, project_id): self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_project.py b/plugins/modules/gitlab_project.py index 5024079b93..744a360f70 100644 --- a/plugins/modules/gitlab_project.py +++ b/plugins/modules/gitlab_project.py @@ -417,7 +417,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( from ansible_collections.community.general.plugins.module_utils.version import LooseVersion -class GitLabProject(object): +class GitLabProject: def __init__(self, module, gitlab_instance): self._module = module self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_project_access_token.py b/plugins/modules/gitlab_project_access_token.py index deeb18c6a5..74102af3fd 100644 --- a/plugins/modules/gitlab_project_access_token.py +++ b/plugins/modules/gitlab_project_access_token.py @@ -164,7 +164,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ACCESS_LEVELS = dict(guest=10, planner=15, reporter=20, developer=30, maintainer=40, owner=50) -class GitLabProjectAccessToken(object): +class GitLabProjectAccessToken: def __init__(self, module, gitlab_instance): self._module = module self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_project_members.py b/plugins/modules/gitlab_project_members.py index f037d1a2b6..6a89c1af6f 100644 --- a/plugins/modules/gitlab_project_members.py +++ b/plugins/modules/gitlab_project_members.py @@ -166,7 +166,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitLabProjectMembers(object): +class GitLabProjectMembers: def __init__(self, module, gl): self._module = module self._gitlab = gl diff --git a/plugins/modules/gitlab_project_variable.py b/plugins/modules/gitlab_project_variable.py index cf8dd47524..ccc6e9cbf8 100644 --- a/plugins/modules/gitlab_project_variable.py +++ b/plugins/modules/gitlab_project_variable.py @@ -244,7 +244,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitlabProjectVariables(object): +class GitlabProjectVariables: def __init__(self, module, gitlab_instance): self.repo = gitlab_instance diff --git a/plugins/modules/gitlab_protected_branch.py b/plugins/modules/gitlab_protected_branch.py index ea2f3fd6d9..fbd0ac3cf2 100644 --- a/plugins/modules/gitlab_protected_branch.py +++ b/plugins/modules/gitlab_protected_branch.py @@ -93,7 +93,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitlabProtectedBranch(object): +class GitlabProtectedBranch: def __init__(self, module, project, gitlab_instance): self.repo = gitlab_instance diff --git a/plugins/modules/gitlab_runner.py b/plugins/modules/gitlab_runner.py index d4574befbb..ed39fa76a8 100644 --- a/plugins/modules/gitlab_runner.py +++ b/plugins/modules/gitlab_runner.py @@ -268,7 +268,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( from ansible_collections.community.general.plugins.module_utils.version import LooseVersion -class GitLabRunner(object): +class GitLabRunner: def __init__(self, module, gitlab_instance, group=None, project=None): self._module = module self._gitlab = gitlab_instance diff --git a/plugins/modules/gitlab_user.py b/plugins/modules/gitlab_user.py index 845c28bafc..9828981431 100644 --- a/plugins/modules/gitlab_user.py +++ b/plugins/modules/gitlab_user.py @@ -225,7 +225,7 @@ from ansible_collections.community.general.plugins.module_utils.gitlab import ( ) -class GitLabUser(object): +class GitLabUser: def __init__(self, module, gitlab_instance): self._module = module self._gitlab = gitlab_instance diff --git a/plugins/modules/haproxy.py b/plugins/modules/haproxy.py index 48ccbdebe1..a6b345555d 100644 --- a/plugins/modules/haproxy.py +++ b/plugins/modules/haproxy.py @@ -227,7 +227,7 @@ class TimeoutException(Exception): pass -class HAProxy(object): +class HAProxy: """ Used for communicating with HAProxy through its local UNIX socket interface. Perform common tasks in Haproxy related to enable server and diff --git a/plugins/modules/hg.py b/plugins/modules/hg.py index afd3e59dd3..4961a87298 100644 --- a/plugins/modules/hg.py +++ b/plugins/modules/hg.py @@ -93,7 +93,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -class Hg(object): +class Hg: def __init__(self, module, dest, repo, revision, hg_path): self.module = module self.dest = dest diff --git a/plugins/modules/homebrew.py b/plugins/modules/homebrew.py index 17e2c35e0d..2216ee683f 100644 --- a/plugins/modules/homebrew.py +++ b/plugins/modules/homebrew.py @@ -202,7 +202,7 @@ def _check_package_in_json(json_output, package_type): # /utils ------------------------------------------------------------------ }}} -class Homebrew(object): +class Homebrew: '''A class to manage Homebrew packages.''' # class validations -------------------------------------------- {{{ diff --git a/plugins/modules/homebrew_cask.py b/plugins/modules/homebrew_cask.py index 7039950e9b..95389631d9 100644 --- a/plugins/modules/homebrew_cask.py +++ b/plugins/modules/homebrew_cask.py @@ -175,7 +175,7 @@ def _create_regex_group_complement(s): # /utils ------------------------------------------------------------------ }}} -class HomebrewCask(object): +class HomebrewCask: '''A class to manage Homebrew casks.''' # class regexes ------------------------------------------------ {{{ diff --git a/plugins/modules/homectl.py b/plugins/modules/homectl.py index 9d42c2cba6..140839efa2 100644 --- a/plugins/modules/homectl.py +++ b/plugins/modules/homectl.py @@ -296,7 +296,7 @@ else: LEGACYCRYPT_IMPORT_ERROR = None -class Homectl(object): +class Homectl: def __init__(self, module): self.module = module self.state = module.params['state'] diff --git a/plugins/modules/hwc_network_vpc.py b/plugins/modules/hwc_network_vpc.py index 8f2ec044dd..d2b0e1b9cf 100644 --- a/plugins/modules/hwc_network_vpc.py +++ b/plugins/modules/hwc_network_vpc.py @@ -454,7 +454,7 @@ def wait_for_delete(module, client, link): module.fail_json(msg=str(ex)) -class VpcRoutesArray(object): +class VpcRoutesArray: def __init__(self, request, module): self.module = module if request: diff --git a/plugins/modules/imgadm.py b/plugins/modules/imgadm.py index e92ac2b089..b3a2ba0c7e 100644 --- a/plugins/modules/imgadm.py +++ b/plugins/modules/imgadm.py @@ -126,7 +126,7 @@ from ansible.module_utils.basic import AnsibleModule # the stacktrace, which breaks the parsers. -class Imgadm(object): +class Imgadm: def __init__(self, module): self.module = module self.params = module.params diff --git a/plugins/modules/infinity.py b/plugins/modules/infinity.py index 68d43f845a..d958ec6d8c 100644 --- a/plugins/modules/infinity.py +++ b/plugins/modules/infinity.py @@ -147,7 +147,7 @@ from ansible.module_utils.basic import AnsibleModule, json from ansible.module_utils.urls import open_url -class Infinity(object): +class Infinity: """ Class for manage REST API calls with the Infinity. """ diff --git a/plugins/modules/ip_netns.py b/plugins/modules/ip_netns.py index 0a3fa9f86d..02e89fe335 100644 --- a/plugins/modules/ip_netns.py +++ b/plugins/modules/ip_netns.py @@ -54,7 +54,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_text -class Namespace(object): +class Namespace: """Interface to network namespaces. """ def __init__(self, module): diff --git a/plugins/modules/ipa_getkeytab.py b/plugins/modules/ipa_getkeytab.py index 482de41693..f88e35d0f7 100644 --- a/plugins/modules/ipa_getkeytab.py +++ b/plugins/modules/ipa_getkeytab.py @@ -127,7 +127,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -class IPAKeytab(object): +class IPAKeytab: def __init__(self, module, **kwargs): self.module = module self.path = kwargs['path'] diff --git a/plugins/modules/ipbase_info.py b/plugins/modules/ipbase_info.py index 2a4dbeac9d..1923c79361 100644 --- a/plugins/modules/ipbase_info.py +++ b/plugins/modules/ipbase_info.py @@ -222,7 +222,7 @@ USER_AGENT = 'ansible-community.general.ipbase_info/0.1.0' BASE_URL = 'https://api.ipbase.com/v2/info' -class IpbaseInfo(object): +class IpbaseInfo: def __init__(self, module): self.module = module diff --git a/plugins/modules/ipify_facts.py b/plugins/modules/ipify_facts.py index ece69504ff..194bbc6fcc 100644 --- a/plugins/modules/ipify_facts.py +++ b/plugins/modules/ipify_facts.py @@ -66,7 +66,7 @@ from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.text.converters import to_text -class IpifyFacts(object): +class IpifyFacts: def __init__(self): self.api_url = module.params.get('api_url') diff --git a/plugins/modules/ipinfoio_facts.py b/plugins/modules/ipinfoio_facts.py index 2cfa05029a..76c712a558 100644 --- a/plugins/modules/ipinfoio_facts.py +++ b/plugins/modules/ipinfoio_facts.py @@ -87,7 +87,7 @@ from ansible.module_utils.urls import fetch_url USER_AGENT = 'ansible-ipinfoio-module/0.0.1' -class IpinfoioFacts(object): +class IpinfoioFacts: def __init__(self, module): self.url = 'https://ipinfo.io/json' diff --git a/plugins/modules/ipwcli_dns.py b/plugins/modules/ipwcli_dns.py index 87593b6ab7..e015cc54ca 100644 --- a/plugins/modules/ipwcli_dns.py +++ b/plugins/modules/ipwcli_dns.py @@ -164,7 +164,7 @@ record: from ansible.module_utils.basic import AnsibleModule -class ResourceRecord(object): +class ResourceRecord: def __init__(self, module): self.module = module diff --git a/plugins/modules/jenkins_job.py b/plugins/modules/jenkins_job.py index dce1de4d04..afa7eed24d 100644 --- a/plugins/modules/jenkins_job.py +++ b/plugins/modules/jenkins_job.py @@ -174,7 +174,7 @@ from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.text.converters import to_native -class JenkinsJob(object): +class JenkinsJob: def __init__(self, module): self.module = module diff --git a/plugins/modules/jenkins_plugin.py b/plugins/modules/jenkins_plugin.py index 9eacea09e6..6c7cd13586 100644 --- a/plugins/modules/jenkins_plugin.py +++ b/plugins/modules/jenkins_plugin.py @@ -352,7 +352,7 @@ class FailedInstallingWithPluginManager(Exception): pass -class JenkinsPlugin(object): +class JenkinsPlugin: def __init__(self, module): # To be able to call fail_json self.module = module diff --git a/plugins/modules/kdeconfig.py b/plugins/modules/kdeconfig.py index fad4e4dbe0..b6b4c4a6bf 100644 --- a/plugins/modules/kdeconfig.py +++ b/plugins/modules/kdeconfig.py @@ -106,7 +106,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_bytes, to_text -class TemporaryDirectory(object): +class TemporaryDirectory: """Basic backport of tempfile.TemporaryDirectory""" def __init__(self, suffix="", prefix="tmp", dir=None): diff --git a/plugins/modules/krb_ticket.py b/plugins/modules/krb_ticket.py index 995319e715..b187c17b55 100644 --- a/plugins/modules/krb_ticket.py +++ b/plugins/modules/krb_ticket.py @@ -188,7 +188,7 @@ from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -class IPAKeytab(object): +class IPAKeytab: def __init__(self, module, **kwargs): self.module = module self.password = kwargs['password'] diff --git a/plugins/modules/lvg_rename.py b/plugins/modules/lvg_rename.py index 76e40afc1c..01768ff019 100644 --- a/plugins/modules/lvg_rename.py +++ b/plugins/modules/lvg_rename.py @@ -60,7 +60,7 @@ argument_spec = dict( ) -class LvgRename(object): +class LvgRename: def __init__(self, module): ''' Orchestrates the lvg_rename module logic. diff --git a/plugins/modules/lxc_container.py b/plugins/modules/lxc_container.py index c4c5b65464..6326fe1229 100644 --- a/plugins/modules/lxc_container.py +++ b/plugins/modules/lxc_container.py @@ -592,7 +592,7 @@ def create_script(command): os.remove(script_file) -class LxcContainerManagement(object): +class LxcContainerManagement: def __init__(self, module): """Management of LXC containers via Ansible. diff --git a/plugins/modules/lxd_container.py b/plugins/modules/lxd_container.py index 96cb3a329d..e62869d750 100644 --- a/plugins/modules/lxd_container.py +++ b/plugins/modules/lxd_container.py @@ -454,7 +454,7 @@ CONFIG_PARAMS = [ CONFIG_CREATION_PARAMS = ['source', 'type'] -class LXDContainerManagement(object): +class LXDContainerManagement: def __init__(self, module): """Management of LXC containers via Ansible. diff --git a/plugins/modules/lxd_profile.py b/plugins/modules/lxd_profile.py index 15dfad50a9..1eb0f07ac1 100644 --- a/plugins/modules/lxd_profile.py +++ b/plugins/modules/lxd_profile.py @@ -240,7 +240,7 @@ CONFIG_PARAMS = [ ] -class LXDProfileManagement(object): +class LXDProfileManagement: def __init__(self, module): """Management of LXC profiles via Ansible. diff --git a/plugins/modules/lxd_project.py b/plugins/modules/lxd_project.py index 019045ccd2..f5013b7340 100644 --- a/plugins/modules/lxd_project.py +++ b/plugins/modules/lxd_project.py @@ -196,7 +196,7 @@ CONFIG_PARAMS = [ ] -class LXDProjectManagement(object): +class LXDProjectManagement: def __init__(self, module): """Management of LXC projects via Ansible. diff --git a/plugins/modules/manageiq_alert_profiles.py b/plugins/modules/manageiq_alert_profiles.py index ff574f8e2a..ac3b8f3292 100644 --- a/plugins/modules/manageiq_alert_profiles.py +++ b/plugins/modules/manageiq_alert_profiles.py @@ -86,7 +86,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec -class ManageIQAlertProfiles(object): +class ManageIQAlertProfiles: """ Object to execute alert profile management operations in manageiq. """ diff --git a/plugins/modules/manageiq_alerts.py b/plugins/modules/manageiq_alerts.py index 670b79eb5b..3909aea576 100644 --- a/plugins/modules/manageiq_alerts.py +++ b/plugins/modules/manageiq_alerts.py @@ -131,7 +131,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec -class ManageIQAlert(object): +class ManageIQAlert: """ Represent a ManageIQ alert. Can be initialized with both the format we receive from the server and the format we get from the user. """ @@ -159,7 +159,7 @@ class ManageIQAlert(object): return self.__dict__ == other.__dict__ -class ManageIQAlerts(object): +class ManageIQAlerts: """ Object to execute alert management operations in manageiq. """ diff --git a/plugins/modules/manageiq_group.py b/plugins/modules/manageiq_group.py index d95b4a9d96..bfaa8e0bbe 100644 --- a/plugins/modules/manageiq_group.py +++ b/plugins/modules/manageiq_group.py @@ -209,7 +209,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec -class ManageIQgroup(object): +class ManageIQgroup: """ Object to execute group management operations in manageiq. """ diff --git a/plugins/modules/manageiq_provider.py b/plugins/modules/manageiq_provider.py index a808f5bc9d..db1cd3af7f 100644 --- a/plugins/modules/manageiq_provider.py +++ b/plugins/modules/manageiq_provider.py @@ -596,7 +596,7 @@ def delete_nulls(h): return h -class ManageIQProvider(object): +class ManageIQProvider: """ Object to execute provider management operations in manageiq. """ diff --git a/plugins/modules/manageiq_tenant.py b/plugins/modules/manageiq_tenant.py index f16dc40894..b543170bf9 100644 --- a/plugins/modules/manageiq_tenant.py +++ b/plugins/modules/manageiq_tenant.py @@ -166,7 +166,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec -class ManageIQTenant(object): +class ManageIQTenant: """ Object to execute tenant management operations in manageiq. """ diff --git a/plugins/modules/manageiq_user.py b/plugins/modules/manageiq_user.py index 75e57c1cfb..d40bea2ed4 100644 --- a/plugins/modules/manageiq_user.py +++ b/plugins/modules/manageiq_user.py @@ -133,7 +133,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.manageiq import ManageIQ, manageiq_argument_spec -class ManageIQUser(object): +class ManageIQUser: """ Object to execute user management operations in manageiq. """ diff --git a/plugins/modules/mas.py b/plugins/modules/mas.py index 06e8942adc..88c9eae18c 100644 --- a/plugins/modules/mas.py +++ b/plugins/modules/mas.py @@ -110,7 +110,7 @@ import platform NOT_WORKING_MAC_VERSION_MAS_ACCOUNT = '12.0' -class Mas(object): +class Mas: def __init__(self, module): self.module = module diff --git a/plugins/modules/maven_artifact.py b/plugins/modules/maven_artifact.py index 82faa07dd5..9e24e07017 100644 --- a/plugins/modules/maven_artifact.py +++ b/plugins/modules/maven_artifact.py @@ -309,7 +309,7 @@ def adjust_recursive_directory_permissions(pre_existing_dir, new_directory_list, return changed -class Artifact(object): +class Artifact: def __init__(self, group_id, artifact_id, version, version_by_spec, classifier='', extension='jar'): if not group_id: raise ValueError("group_id must be set") diff --git a/plugins/modules/modprobe.py b/plugins/modules/modprobe.py index b4b7890eea..d8f192b0fa 100644 --- a/plugins/modules/modprobe.py +++ b/plugins/modules/modprobe.py @@ -93,7 +93,7 @@ MODULES_LOAD_LOCATION = '/etc/modules-load.d' PARAMETERS_FILES_LOCATION = '/etc/modprobe.d' -class Modprobe(object): +class Modprobe: def __init__(self, module): self.module = module diff --git a/plugins/modules/monit.py b/plugins/modules/monit.py index 08c1ded19e..f903cbdd42 100644 --- a/plugins/modules/monit.py +++ b/plugins/modules/monit.py @@ -95,7 +95,7 @@ class StatusValue(namedtuple("Status", "value, is_pending")): return f"{self.value}{' (pending)' if self.is_pending else ''}" -class Status(object): +class Status: MISSING = StatusValue(StatusValue.MISSING) OK = StatusValue(StatusValue.OK) RUNNING = StatusValue(StatusValue.OK) @@ -105,7 +105,7 @@ class Status(object): EXECUTION_FAILED = StatusValue(StatusValue.EXECUTION_FAILED) -class Monit(object): +class Monit: def __init__(self, module, monit_bin_path, service_name, timeout): self.module = module self.monit_bin_path = monit_bin_path diff --git a/plugins/modules/nagios.py b/plugins/modules/nagios.py index ee561bdfff..bb83afcac7 100644 --- a/plugins/modules/nagios.py +++ b/plugins/modules/nagios.py @@ -362,7 +362,7 @@ def main(): ansible_nagios.act() -class Nagios(object): +class Nagios: """ Perform common tasks in Nagios related to downtime and notifications. diff --git a/plugins/modules/nginx_status_info.py b/plugins/modules/nginx_status_info.py index 563d6cdafe..50a5506fc9 100644 --- a/plugins/modules/nginx_status_info.py +++ b/plugins/modules/nginx_status_info.py @@ -98,7 +98,7 @@ from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.text.converters import to_text -class NginxStatusInfo(object): +class NginxStatusInfo: def __init__(self): self.url = module.params.get('url') diff --git a/plugins/modules/nictagadm.py b/plugins/modules/nictagadm.py index 1edca35f80..1b8a03f559 100644 --- a/plugins/modules/nictagadm.py +++ b/plugins/modules/nictagadm.py @@ -106,7 +106,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.network import is_mac -class NicTag(object): +class NicTag: def __init__(self, module): self.module = module diff --git a/plugins/modules/nmcli.py b/plugins/modules/nmcli.py index 41b6fdc28b..2ad5161605 100644 --- a/plugins/modules/nmcli.py +++ b/plugins/modules/nmcli.py @@ -1690,7 +1690,7 @@ class NmcliModuleError(Exception): pass -class Nmcli(object): +class Nmcli: """ This is the generic nmcli manipulation class that is subclassed based on platform. A subclass may wish to override the following action methods:- diff --git a/plugins/modules/npm.py b/plugins/modules/npm.py index 6d1469d91a..130daa02c0 100644 --- a/plugins/modules/npm.py +++ b/plugins/modules/npm.py @@ -162,7 +162,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -class Npm(object): +class Npm: def __init__(self, module, **kwargs): self.module = module self.glbl = kwargs['glbl'] diff --git a/plugins/modules/nsupdate.py b/plugins/modules/nsupdate.py index 04e5881f2b..dcf56be09a 100644 --- a/plugins/modules/nsupdate.py +++ b/plugins/modules/nsupdate.py @@ -200,7 +200,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule, missing_required_lib -class RecordManager(object): +class RecordManager: def __init__(self, module): self.module = module diff --git a/plugins/modules/onepassword_info.py b/plugins/modules/onepassword_info.py index 1bea0317ac..74cce3b964 100644 --- a/plugins/modules/onepassword_info.py +++ b/plugins/modules/onepassword_info.py @@ -177,7 +177,7 @@ class AnsibleModuleError(Exception): return self.results -class OnePasswordInfo(object): +class OnePasswordInfo: def __init__(self): self.cli_path = module.params.get('cli_path') diff --git a/plugins/modules/opendj_backendprop.py b/plugins/modules/opendj_backendprop.py index 25363391d3..2f6175f59a 100644 --- a/plugins/modules/opendj_backendprop.py +++ b/plugins/modules/opendj_backendprop.py @@ -97,7 +97,7 @@ RETURN = r""" from ansible.module_utils.basic import AnsibleModule -class BackendProp(object): +class BackendProp: def __init__(self, module): self._module = module diff --git a/plugins/modules/osx_defaults.py b/plugins/modules/osx_defaults.py index 3982af032c..66f6763764 100644 --- a/plugins/modules/osx_defaults.py +++ b/plugins/modules/osx_defaults.py @@ -149,7 +149,7 @@ class OSXDefaultsException(Exception): # /exceptions -------------------------------------------------------------- }}} # class MacDefaults -------------------------------------------------------- {{{ -class OSXDefaults(object): +class OSXDefaults: """ Class to manage Mac OS user defaults """ # init ---------------------------------------------------------------- {{{ diff --git a/plugins/modules/pacman.py b/plugins/modules/pacman.py index f27f9b9037..fffdc1c69c 100644 --- a/plugins/modules/pacman.py +++ b/plugins/modules/pacman.py @@ -248,7 +248,7 @@ from ansible.module_utils.basic import AnsibleModule from collections import defaultdict, namedtuple -class Package(object): +class Package: def __init__(self, name, source, source_is_URL=False): self.name = name self.source = source @@ -267,7 +267,7 @@ class Package(object): VersionTuple = namedtuple("VersionTuple", ["current", "latest"]) -class Pacman(object): +class Pacman: def __init__(self, module): self.m = module diff --git a/plugins/modules/pacman_key.py b/plugins/modules/pacman_key.py index 03ee17bfb8..75555a5dda 100644 --- a/plugins/modules/pacman_key.py +++ b/plugins/modules/pacman_key.py @@ -133,7 +133,7 @@ from ansible.module_utils.urls import fetch_url from ansible.module_utils.common.text.converters import to_native -class GpgListResult(object): +class GpgListResult: """Wraps gpg --list-* output.""" def __init__(self, line): @@ -176,7 +176,7 @@ def gpg_get_all_attrs_of_kind(lines, kind, attr): return result -class PacmanKey(object): +class PacmanKey: def __init__(self, module): self.module = module # obtain binary paths for gpg & pacman-key diff --git a/plugins/modules/pagerduty.py b/plugins/modules/pagerduty.py index 569259eb40..c6439053e6 100644 --- a/plugins/modules/pagerduty.py +++ b/plugins/modules/pagerduty.py @@ -153,7 +153,7 @@ from ansible_collections.community.general.plugins.module_utils.datetime import ) -class PagerDutyRequest(object): +class PagerDutyRequest: def __init__(self, module, name, user, token): self.module = module self.name = name diff --git a/plugins/modules/pagerduty_user.py b/plugins/modules/pagerduty_user.py index 1275a957fd..36fda8f2e4 100644 --- a/plugins/modules/pagerduty_user.py +++ b/plugins/modules/pagerduty_user.py @@ -90,7 +90,7 @@ with deps.declare("pdpyras", url="https://github.com/PagerDuty/pdpyras"): from pdpyras import APISession, PDClientError -class PagerDutyUser(object): +class PagerDutyUser: def __init__(self, module, session): self._module = module self._apisession = session diff --git a/plugins/modules/pamd.py b/plugins/modules/pamd.py index cc8a5345f3..f0eb8f9e27 100644 --- a/plugins/modules/pamd.py +++ b/plugins/modules/pamd.py @@ -244,7 +244,7 @@ RULE_ARG_REGEX = re.compile(r"(\[.*\]|\S*)") VALID_TYPES = ['account', '-account', 'auth', '-auth', 'password', '-password', 'session', '-session'] -class PamdLine(object): +class PamdLine: def __init__(self, line): self.line = line @@ -403,7 +403,7 @@ class PamdRule(PamdLine): # PamdService encapsulates an entire service and contains one or more rules. It seems the best way is to do this # as a doubly linked list. -class PamdService(object): +class PamdService: def __init__(self, content): self._head = None diff --git a/plugins/modules/pids.py b/plugins/modules/pids.py index 9fb71c38ae..437180c02a 100644 --- a/plugins/modules/pids.py +++ b/plugins/modules/pids.py @@ -79,7 +79,7 @@ class PSAdapterError(Exception): pass -class PSAdapter(object, metaclass=abc.ABCMeta): +class PSAdapter(metaclass=abc.ABCMeta): NAME_ATTRS = ('name', 'cmdline') PATTERN_ATTRS = ('name', 'exe', 'cmdline') @@ -176,7 +176,7 @@ def compare_lower(a, b): return a.lower() == b.lower() -class Pids(object): +class Pids: def __init__(self, module): deps.validate(module) diff --git a/plugins/modules/pkgin.py b/plugins/modules/pkgin.py index 28da44c075..4f8dd88c5a 100644 --- a/plugins/modules/pkgin.py +++ b/plugins/modules/pkgin.py @@ -128,7 +128,7 @@ import re from ansible.module_utils.basic import AnsibleModule -class PackageState(object): +class PackageState: PRESENT = 1 NOT_INSTALLED = 2 OUTDATED = 4 diff --git a/plugins/modules/pmem.py b/plugins/modules/pmem.py index e31a968cfc..72b40bde6c 100644 --- a/plugins/modules/pmem.py +++ b/plugins/modules/pmem.py @@ -220,7 +220,7 @@ else: XMLTODICT_LIBRARY_IMPORT_ERROR = None -class PersistentMemory(object): +class PersistentMemory: def __init__(self): module = AnsibleModule( argument_spec=dict( diff --git a/plugins/modules/pnpm.py b/plugins/modules/pnpm.py index 35551b1647..8b5611299e 100644 --- a/plugins/modules/pnpm.py +++ b/plugins/modules/pnpm.py @@ -159,7 +159,7 @@ import os from ansible.module_utils.basic import AnsibleModule -class Pnpm(object): +class Pnpm: def __init__(self, module, **kwargs): self.module = module self.name = kwargs["name"] diff --git a/plugins/modules/pulp_repo.py b/plugins/modules/pulp_repo.py index 9925f22b8d..ffa78e0d68 100644 --- a/plugins/modules/pulp_repo.py +++ b/plugins/modules/pulp_repo.py @@ -203,7 +203,7 @@ from ansible.module_utils.urls import fetch_url from ansible.module_utils.urls import url_argument_spec -class pulp_server(object): +class pulp_server: """ Class to interact with a Pulp server """ diff --git a/plugins/modules/pushover.py b/plugins/modules/pushover.py index abe58a2777..5d547800ce 100644 --- a/plugins/modules/pushover.py +++ b/plugins/modules/pushover.py @@ -92,7 +92,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -class Pushover(object): +class Pushover: ''' Instantiates a pushover object, use it to send notifications ''' base_uri = 'https://api.pushover.net' diff --git a/plugins/modules/redhat_subscription.py b/plugins/modules/redhat_subscription.py index e35dd621ae..71c382f0da 100644 --- a/plugins/modules/redhat_subscription.py +++ b/plugins/modules/redhat_subscription.py @@ -284,7 +284,7 @@ from ansible.module_utils import distro SUBMAN_CMD = None -class Rhsm(object): +class Rhsm: REDHAT_REPO = "/etc/yum.repos.d/redhat.repo" @@ -831,7 +831,7 @@ class Rhsm(object): rc, stdout, stderr = self.module.run_command(args, check_rc=False) -class RhsmPool(object): +class RhsmPool: ''' Convenience class for housing subscription information ''' @@ -859,7 +859,7 @@ class RhsmPool(object): return False -class RhsmPools(object): +class RhsmPools: """ This class is used for manipulating pools subscriptions with RHSM """ @@ -928,7 +928,7 @@ class RhsmPools(object): yield product -class SysPurpose(object): +class SysPurpose: """ This class is used for reading and writing to syspurpose.json file """ diff --git a/plugins/modules/rhevm.py b/plugins/modules/rhevm.py index 8156aed6df..ed5e738fbe 100644 --- a/plugins/modules/rhevm.py +++ b/plugins/modules/rhevm.py @@ -352,7 +352,7 @@ changed = False failed = False -class RHEVConn(object): +class RHEVConn: 'Connection to RHEV-M' def __init__(self, module): @@ -998,7 +998,7 @@ class RHEVConn(object): return True -class RHEV(object): +class RHEV: def __init__(self, module): self.module = module diff --git a/plugins/modules/rhsm_repository.py b/plugins/modules/rhsm_repository.py index 168145a384..1e8d4942c1 100644 --- a/plugins/modules/rhsm_repository.py +++ b/plugins/modules/rhsm_repository.py @@ -87,7 +87,7 @@ from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -class Rhsm(object): +class Rhsm: def __init__(self, module): self.module = module self.rhsm_bin = self.module.get_bin_path('subscription-manager', required=True) diff --git a/plugins/modules/rundeck_job_executions_info.py b/plugins/modules/rundeck_job_executions_info.py index dbc3adad20..b067a5dfbc 100644 --- a/plugins/modules/rundeck_job_executions_info.py +++ b/plugins/modules/rundeck_job_executions_info.py @@ -136,7 +136,7 @@ from ansible_collections.community.general.plugins.module_utils.rundeck import ( ) -class RundeckJobExecutionsInfo(object): +class RundeckJobExecutionsInfo: def __init__(self, module): self.module = module self.url = self.module.params["url"] diff --git a/plugins/modules/rundeck_job_run.py b/plugins/modules/rundeck_job_run.py index 2c95346920..52909f5412 100644 --- a/plugins/modules/rundeck_job_run.py +++ b/plugins/modules/rundeck_job_run.py @@ -189,7 +189,7 @@ from ansible_collections.community.general.plugins.module_utils.rundeck import ( ) -class RundeckJobRun(object): +class RundeckJobRun: def __init__(self, module): self.module = module self.url = self.module.params["url"] diff --git a/plugins/modules/rundeck_project.py b/plugins/modules/rundeck_project.py index ce67614987..5ace492c6d 100644 --- a/plugins/modules/rundeck_project.py +++ b/plugins/modules/rundeck_project.py @@ -105,7 +105,7 @@ from ansible_collections.community.general.plugins.module_utils.rundeck import ( ) -class RundeckProjectManager(object): +class RundeckProjectManager: def __init__(self, module): self.module = module diff --git a/plugins/modules/runit.py b/plugins/modules/runit.py index 917b0bc395..430862d5ad 100644 --- a/plugins/modules/runit.py +++ b/plugins/modules/runit.py @@ -89,7 +89,7 @@ import re from ansible.module_utils.basic import AnsibleModule -class Sv(object): +class Sv: """ Main class that handles daemontools, can be subclassed and overridden in case we want to use a 'derivative' like encore, s6, etc diff --git a/plugins/modules/simpleinit_msb.py b/plugins/modules/simpleinit_msb.py index 39941f4558..642bcc0797 100644 --- a/plugins/modules/simpleinit_msb.py +++ b/plugins/modules/simpleinit_msb.py @@ -79,7 +79,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.service import daemonize -class SimpleinitMSB(object): +class SimpleinitMSB: """ Main simpleinit-msb service manipulation class """ diff --git a/plugins/modules/smartos_image_info.py b/plugins/modules/smartos_image_info.py index 0c68a4c52f..5ac18c98f3 100644 --- a/plugins/modules/smartos_image_info.py +++ b/plugins/modules/smartos_image_info.py @@ -69,7 +69,7 @@ import json from ansible.module_utils.basic import AnsibleModule -class ImageFacts(object): +class ImageFacts: def __init__(self, module): self.module = module diff --git a/plugins/modules/snmp_facts.py b/plugins/modules/snmp_facts.py index 4c94641410..c1c39e8914 100644 --- a/plugins/modules/snmp_facts.py +++ b/plugins/modules/snmp_facts.py @@ -195,7 +195,7 @@ with deps.declare("pysnmp"): from pysnmp.proto.rfc1905 import EndOfMibView -class DefineOid(object): +class DefineOid: def __init__(self, dotprefix=False): if dotprefix: diff --git a/plugins/modules/solaris_zone.py b/plugins/modules/solaris_zone.py index 0cea4a0226..2390d3268d 100644 --- a/plugins/modules/solaris_zone.py +++ b/plugins/modules/solaris_zone.py @@ -153,7 +153,7 @@ import time from ansible.module_utils.basic import AnsibleModule -class Zone(object): +class Zone: def __init__(self, module): self.changed = False self.msg = [] diff --git a/plugins/modules/ssh_config.py b/plugins/modules/ssh_config.py index 11adf6a496..9570737835 100644 --- a/plugins/modules/ssh_config.py +++ b/plugins/modules/ssh_config.py @@ -244,7 +244,7 @@ def fix_bool_str(value): return value -class SSHConfig(object): +class SSHConfig: def __init__(self, module): self.module = module if not HAS_PARAMIKO: diff --git a/plugins/modules/stacki_host.py b/plugins/modules/stacki_host.py index 74bf32bc60..66df8a3e41 100644 --- a/plugins/modules/stacki_host.py +++ b/plugins/modules/stacki_host.py @@ -125,7 +125,7 @@ from urllib.parse import urlencode from ansible.module_utils.urls import fetch_url -class StackiHost(object): +class StackiHost: def __init__(self, module): self.module = module diff --git a/plugins/modules/sudoers.py b/plugins/modules/sudoers.py index 303714ea0e..dde17c74e5 100644 --- a/plugins/modules/sudoers.py +++ b/plugins/modules/sudoers.py @@ -162,7 +162,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.text.converters import to_native -class Sudoers(object): +class Sudoers: FILE_MODE = 0o440 diff --git a/plugins/modules/svc.py b/plugins/modules/svc.py index 207951f8fe..e24746b062 100644 --- a/plugins/modules/svc.py +++ b/plugins/modules/svc.py @@ -116,7 +116,7 @@ def _load_dist_subclass(cls, *args, **kwargs): return super(cls, subclass).__new__(subclass) -class Svc(object): +class Svc: """ Main class that handles daemontools, can be subclassed and overridden in case we want to use a 'derivative' like encore, s6, etc diff --git a/plugins/modules/swupd.py b/plugins/modules/swupd.py index 087068303b..7322bfbaaf 100644 --- a/plugins/modules/swupd.py +++ b/plugins/modules/swupd.py @@ -99,7 +99,7 @@ import os from ansible.module_utils.basic import AnsibleModule -class Swupd(object): +class Swupd: FILES_NOT_MATCH = "files did not match" FILES_REPLACED = "missing files were replaced" FILES_FIXED = "files were fixed" diff --git a/plugins/modules/timezone.py b/plugins/modules/timezone.py index 60878d176e..920432cc44 100644 --- a/plugins/modules/timezone.py +++ b/plugins/modules/timezone.py @@ -73,7 +73,7 @@ import filecmp from ansible.module_utils.basic import AnsibleModule, get_distribution -class Timezone(object): +class Timezone: """This is a generic Timezone manipulation class that is subclassed based on platform. A subclass may wish to override the following action methods: diff --git a/plugins/modules/yarn.py b/plugins/modules/yarn.py index d52cc1f3c9..119288dc06 100644 --- a/plugins/modules/yarn.py +++ b/plugins/modules/yarn.py @@ -139,7 +139,7 @@ import json from ansible.module_utils.basic import AnsibleModule -class Yarn(object): +class Yarn: def __init__(self, module, **kwargs): self.module = module diff --git a/plugins/modules/zfs.py b/plugins/modules/zfs.py index 3632618f70..38aea68a6b 100644 --- a/plugins/modules/zfs.py +++ b/plugins/modules/zfs.py @@ -94,7 +94,7 @@ import os from ansible.module_utils.basic import AnsibleModule -class Zfs(object): +class Zfs: def __init__(self, module, name, extra_zfs_properties): self.module = module diff --git a/plugins/modules/zfs_delegate_admin.py b/plugins/modules/zfs_delegate_admin.py index 30f670b194..c2de96f21f 100644 --- a/plugins/modules/zfs_delegate_admin.py +++ b/plugins/modules/zfs_delegate_admin.py @@ -116,7 +116,7 @@ from itertools import product from ansible.module_utils.basic import AnsibleModule -class ZfsDelegateAdmin(object): +class ZfsDelegateAdmin: def __init__(self, module): self.module = module self.name = module.params.get('name') diff --git a/plugins/modules/zfs_facts.py b/plugins/modules/zfs_facts.py index 3c5495bf0e..cc37ecbfb9 100644 --- a/plugins/modules/zfs_facts.py +++ b/plugins/modules/zfs_facts.py @@ -158,7 +158,7 @@ from ansible.module_utils.basic import AnsibleModule SUPPORTED_TYPES = ['all', 'filesystem', 'volume', 'snapshot', 'bookmark'] -class ZFSFacts(object): +class ZFSFacts: def __init__(self, module): self.module = module diff --git a/plugins/modules/zpool.py b/plugins/modules/zpool.py index e83fa97927..ea308561e9 100644 --- a/plugins/modules/zpool.py +++ b/plugins/modules/zpool.py @@ -140,7 +140,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt -class Zpool(object): +class Zpool: def __init__(self, module, name, disable_new_features, force, pool_properties, filesystem_properties, mountpoint, altroot, temp_name, vdevs): self.module = module diff --git a/plugins/modules/zpool_facts.py b/plugins/modules/zpool_facts.py index c92160c922..326e8c22af 100644 --- a/plugins/modules/zpool_facts.py +++ b/plugins/modules/zpool_facts.py @@ -119,7 +119,7 @@ from collections import defaultdict from ansible.module_utils.basic import AnsibleModule -class ZPoolFacts(object): +class ZPoolFacts: def __init__(self, module): self.module = module diff --git a/plugins/test/a_module.py b/plugins/test/a_module.py index bbe51a5883..e8b5f7b73b 100644 --- a/plugins/test/a_module.py +++ b/plugins/test/a_module.py @@ -62,7 +62,7 @@ def a_module(term): return False -class TestModule(object): +class TestModule: ''' Ansible jinja2 tests ''' def tests(self): diff --git a/plugins/test/ansible_type.py b/plugins/test/ansible_type.py index e906f2b119..898252fbbb 100644 --- a/plugins/test/ansible_type.py +++ b/plugins/test/ansible_type.py @@ -244,7 +244,7 @@ def ansible_type(data, dtype, alias=None): return _ansible_type(data, alias) in data_types -class TestModule(object): +class TestModule: def tests(self): return { diff --git a/plugins/test/fqdn_valid.py b/plugins/test/fqdn_valid.py index a0fd0c935e..b962dfe108 100644 --- a/plugins/test/fqdn_valid.py +++ b/plugins/test/fqdn_valid.py @@ -88,7 +88,7 @@ def fqdn_valid(name, min_labels=1, allow_underscores=False): return (fobj.is_valid) -class TestModule(object): +class TestModule: ''' Ansible test hostname validity. https://pypi.org/project/fqdn/ ''' diff --git a/ruff.toml b/ruff.toml index 47c0810182..98e89682cb 100644 --- a/ruff.toml +++ b/ruff.toml @@ -25,7 +25,6 @@ ignore = [ "E713", # "not in" test "E714", # "not is" test "F841", # Unused variable - "UP004", # Class `xxx` inherits from `object` "UP006", # Use `dict` instead of `t.Dict` for type annotation "UP007", # Use `X | Y` for type annotations "UP008", # Use `super()` instead of `super(__class__, self)` @@ -34,7 +33,6 @@ ignore = [ "UP018", # Unnecessary `str` call (rewrite as a literal) "UP020", # Use builtin `open` "UP024", # Replace aliased errors with `OSError` - "UP025", # Remove unicode literals from strings "UP028", # Replace `yield` over `for` loop with `yield from` "UP029", # Unnecessary builtin import: `open` "UP030", # Use implicit references for positional format fields diff --git a/tests/unit/plugins/inventory/test_opennebula.py b/tests/unit/plugins/inventory/test_opennebula.py index ed7d43d63a..5c8d5aed97 100644 --- a/tests/unit/plugins/inventory/test_opennebula.py +++ b/tests/unit/plugins/inventory/test_opennebula.py @@ -45,7 +45,7 @@ def access_mock(path, can_access=True): return access -class HistoryEntry(object): +class HistoryEntry: def __init__(self): self.SEQ = '384' self.HOSTNAME = 'sam-691-sam' @@ -57,7 +57,7 @@ class HistoryEntry(object): self.ACTION = '0' -class HistoryRecords(object): +class HistoryRecords: def __init__(self): self.HISTORY = [HistoryEntry()] diff --git a/tests/unit/plugins/module_utils/test_database.py b/tests/unit/plugins/module_utils/test_database.py index 65ddfe2bc4..0f7f493b3a 100644 --- a/tests/unit/plugins/module_utils/test_database.py +++ b/tests/unit/plugins/module_utils/test_database.py @@ -84,33 +84,33 @@ VALID_QUOTES = ((test, VALID[test]) for test in sorted(VALID)) INVALID_QUOTES = ((test[0], test[1], INVALID[test]) for test in sorted(INVALID)) IS_STRINGS_DANGEROUS = ( - (u'', False), - (u' ', False), - (u'alternative database', False), - (u'backup of TRUNCATED table', False), - (u'bob.dropper', False), - (u'd\'artagnan', False), - (u'user_with_select_update_truncate_right', False), - (u';DROP DATABASE fluffy_pets_photos', True), - (u';drop DATABASE fluffy_pets_photos', True), - (u'; TRUNCATE TABLE his_valuable_table', True), - (u'; truncate TABLE his_valuable_table', True), - (u'\'--', True), - (u'"--', True), - (u'\' union select username, password from admin_credentials', True), - (u'\' UNION SELECT username, password from admin_credentials', True), - (u'\' intersect select', True), - (u'\' INTERSECT select', True), - (u'\' except select', True), - (u'\' EXCEPT select', True), - (u';ALTER TABLE prices', True), - (u';alter table prices', True), - (u"; UPDATE products SET price = '0'", True), - (u";update products SET price = '0'", True), - (u"; DELETE FROM products", True), - (u"; delete FROM products", True), - (u"; SELECT * FROM products", True), - (u" ; select * from products", True), + ('', False), + (' ', False), + ('alternative database', False), + ('backup of TRUNCATED table', False), + ('bob.dropper', False), + ('d\'artagnan', False), + ('user_with_select_update_truncate_right', False), + (';DROP DATABASE fluffy_pets_photos', True), + (';drop DATABASE fluffy_pets_photos', True), + ('; TRUNCATE TABLE his_valuable_table', True), + ('; truncate TABLE his_valuable_table', True), + ('\'--', True), + ('"--', True), + ('\' union select username, password from admin_credentials', True), + ('\' UNION SELECT username, password from admin_credentials', True), + ('\' intersect select', True), + ('\' INTERSECT select', True), + ('\' except select', True), + ('\' EXCEPT select', True), + (';ALTER TABLE prices', True), + (';alter table prices', True), + ("; UPDATE products SET price = '0'", True), + (";update products SET price = '0'", True), + ("; DELETE FROM products", True), + ("; delete FROM products", True), + ("; SELECT * FROM products", True), + (" ; select * from products", True), ) diff --git a/tests/unit/plugins/module_utils/test_module_helper.py b/tests/unit/plugins/module_utils/test_module_helper.py index abc1e21085..acf17f4561 100644 --- a/tests/unit/plugins/module_utils/test_module_helper.py +++ b/tests/unit/plugins/module_utils/test_module_helper.py @@ -38,7 +38,7 @@ CAUSE_CHG_DECO_IDS = sorted(CAUSE_CHG_DECO.keys()) ids=CAUSE_CHG_DECO_IDS) def test_cause_changes_deco(deco_args, expect_exception, expect_changed): - class MockMH(object): + class MockMH: changed = None @cause_changes(**deco_args) diff --git a/tests/unit/plugins/module_utils/test_saslprep.py b/tests/unit/plugins/module_utils/test_saslprep.py index e09e0b6aa1..8feb209e23 100644 --- a/tests/unit/plugins/module_utils/test_saslprep.py +++ b/tests/unit/plugins/module_utils/test_saslprep.py @@ -11,36 +11,36 @@ from ansible_collections.community.general.plugins.module_utils.saslprep import VALID = [ - (u'', u''), - (u'\u00A0', u' '), - (u'a', u'a'), - (u'й', u'й'), - (u'\u30DE\u30C8\u30EA\u30C3\u30AF\u30B9', u'\u30DE\u30C8\u30EA\u30C3\u30AF\u30B9'), - (u'The\u00ADM\u00AAtr\u2168', u'TheMatrIX'), - (u'I\u00ADX', u'IX'), - (u'user', u'user'), - (u'USER', u'USER'), - (u'\u00AA', u'a'), - (u'\u2168', u'IX'), - (u'\u05BE\u00A0\u05BE', u'\u05BE\u0020\u05BE'), + ('', ''), + ('\u00A0', ' '), + ('a', 'a'), + ('й', 'й'), + ('\u30DE\u30C8\u30EA\u30C3\u30AF\u30B9', '\u30DE\u30C8\u30EA\u30C3\u30AF\u30B9'), + ('The\u00ADM\u00AAtr\u2168', 'TheMatrIX'), + ('I\u00ADX', 'IX'), + ('user', 'user'), + ('USER', 'USER'), + ('\u00AA', 'a'), + ('\u2168', 'IX'), + ('\u05BE\u00A0\u05BE', '\u05BE\u0020\u05BE'), ] INVALID = [ (None, TypeError), (b'', TypeError), - (u'\u0221', ValueError), - (u'\u0007', ValueError), - (u'\u0627\u0031', ValueError), - (u'\uE0001', ValueError), - (u'\uE0020', ValueError), - (u'\uFFF9', ValueError), - (u'\uFDD0', ValueError), - (u'\u0000', ValueError), - (u'\u06DD', ValueError), - (u'\uFFFFD', ValueError), - (u'\uD800', ValueError), - (u'\u200E', ValueError), - (u'\u05BE\u00AA\u05BE', ValueError), + ('\u0221', ValueError), + ('\u0007', ValueError), + ('\u0627\u0031', ValueError), + ('\uE0001', ValueError), + ('\uE0020', ValueError), + ('\uFFF9', ValueError), + ('\uFDD0', ValueError), + ('\u0000', ValueError), + ('\u06DD', ValueError), + ('\uFFFFD', ValueError), + ('\uD800', ValueError), + ('\u200E', ValueError), + ('\u05BE\u00AA\u05BE', ValueError), ] diff --git a/tests/unit/plugins/module_utils/xenserver/FakeXenAPI.py b/tests/unit/plugins/module_utils/xenserver/FakeXenAPI.py index e540615ee5..84645acf59 100644 --- a/tests/unit/plugins/module_utils/xenserver/FakeXenAPI.py +++ b/tests/unit/plugins/module_utils/xenserver/FakeXenAPI.py @@ -16,7 +16,7 @@ class Failure(Exception): return str(self.details) -class Session(object): +class Session: def __init__(self, uri, transport=None, encoding=None, verbose=0, allow_none=1, ignore_ssl=False): diff --git a/tests/unit/plugins/modules/FakeXenAPI.py b/tests/unit/plugins/modules/FakeXenAPI.py index e540615ee5..84645acf59 100644 --- a/tests/unit/plugins/modules/FakeXenAPI.py +++ b/tests/unit/plugins/modules/FakeXenAPI.py @@ -16,7 +16,7 @@ class Failure(Exception): return str(self.details) -class Session(object): +class Session: def __init__(self, uri, transport=None, encoding=None, verbose=0, allow_none=1, ignore_ssl=False): diff --git a/tests/unit/plugins/modules/gitlab.py b/tests/unit/plugins/modules/gitlab.py index d5eeebfcd1..5738d2190a 100644 --- a/tests/unit/plugins/modules/gitlab.py +++ b/tests/unit/plugins/modules/gitlab.py @@ -14,7 +14,7 @@ from httmock import urlmatch # noqa import gitlab -class FakeAnsibleModule(object): +class FakeAnsibleModule: def __init__(self, module_params=None): self.check_mode = False self.params = module_params if module_params else {} diff --git a/tests/unit/plugins/modules/hpe_test_utils.py b/tests/unit/plugins/modules/hpe_test_utils.py index 90a17382f7..96bed5aa89 100644 --- a/tests/unit/plugins/modules/hpe_test_utils.py +++ b/tests/unit/plugins/modules/hpe_test_utils.py @@ -14,7 +14,7 @@ from .oneview_module_loader import ONEVIEW_MODULE_UTILS_PATH from hpOneView.oneview_client import OneViewClient -class OneViewBaseTest(object): +class OneViewBaseTest: @pytest.fixture(autouse=True) def setUp(self, mock_ansible_module, mock_ov_client, request): marker = request.node.get_marker('resource') @@ -88,7 +88,7 @@ class FactsParamsTest(OneViewBaseTest): self.resource.get_all.assert_called_once_with() -class OneViewBaseTestCase(object): +class OneViewBaseTestCase: mock_ov_client_from_json_file = None testing_class = None mock_ansible_module = None diff --git a/tests/unit/plugins/modules/test_alerta_customer.py b/tests/unit/plugins/modules/test_alerta_customer.py index abe649304c..e5265a1e85 100644 --- a/tests/unit/plugins/modules/test_alerta_customer.py +++ b/tests/unit/plugins/modules/test_alerta_customer.py @@ -12,7 +12,7 @@ from ansible_collections.community.general.plugins.modules import alerta_custome from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args -class MockedReponse(object): +class MockedReponse: def __init__(self, data): self.data = data diff --git a/tests/unit/plugins/modules/test_circonus_annotation.py b/tests/unit/plugins/modules/test_circonus_annotation.py index 3cdaec8ac8..5240c72d2b 100644 --- a/tests/unit/plugins/modules/test_circonus_annotation.py +++ b/tests/unit/plugins/modules/test_circonus_annotation.py @@ -91,7 +91,7 @@ class TestCirconusAnnotation(ModuleTestCase): '_last_modified': 1502236928, '_last_modified_by': '/user/1000', # use res['annotation']['category'].encode('latin1').decode('utf8') - 'category': u'new cat\xc3\xa9gor\xc3\xbf', + 'category': 'new cat\xc3\xa9gor\xc3\xbf', 'description': 'test description', 'rel_metrics': [], 'start': 1502236927, diff --git a/tests/unit/plugins/modules/test_jenkins_plugin.py b/tests/unit/plugins/modules/test_jenkins_plugin.py index f756547288..1946ee3013 100644 --- a/tests/unit/plugins/modules/test_jenkins_plugin.py +++ b/tests/unit/plugins/modules/test_jenkins_plugin.py @@ -21,7 +21,7 @@ def pass_function(*args, **kwargs): pass -GITHUB_DATA = {"url": u'https://api.github.com/repos/ansible/ansible', +GITHUB_DATA = {"url": 'https://api.github.com/repos/ansible/ansible', "response": b""" { "id": 3638964, diff --git a/tests/unit/plugins/modules/test_pagerduty_alert.py b/tests/unit/plugins/modules/test_pagerduty_alert.py index ff5cf75198..bac654d0f6 100644 --- a/tests/unit/plugins/modules/test_pagerduty_alert.py +++ b/tests/unit/plugins/modules/test_pagerduty_alert.py @@ -46,7 +46,7 @@ class PagerDutyAlertsTest(unittest.TestCase): ) -class Response(object): +class Response: def read(self): return '{"incidents":[{"id": "incident_id", "status": "triggered"}]}' diff --git a/tests/unit/plugins/modules/test_rhsm_repository.py b/tests/unit/plugins/modules/test_rhsm_repository.py index eb920a21e6..3dc0bc10d5 100644 --- a/tests/unit/plugins/modules/test_rhsm_repository.py +++ b/tests/unit/plugins/modules/test_rhsm_repository.py @@ -34,7 +34,7 @@ def patch_rhsm_repository(mocker): return_value=0) -class Repos(object): +class Repos: """ Helper class to represent a list of repositories diff --git a/tests/unit/plugins/modules/uthelper.py b/tests/unit/plugins/modules/uthelper.py index 7c420af0b7..eb5dba2f0d 100644 --- a/tests/unit/plugins/modules/uthelper.py +++ b/tests/unit/plugins/modules/uthelper.py @@ -13,7 +13,7 @@ import yaml import pytest -class UTHelper(object): +class UTHelper: TEST_SPEC_VALID_SECTIONS = ["anchors", "test_cases"] @staticmethod diff --git a/tests/unit/plugins/plugin_utils/test_unsafe.py b/tests/unit/plugins/plugin_utils/test_unsafe.py index c0eecbeb74..8d2bb85429 100644 --- a/tests/unit/plugins/plugin_utils/test_unsafe.py +++ b/tests/unit/plugins/plugin_utils/test_unsafe.py @@ -21,14 +21,14 @@ from ansible_collections.community.general.plugins.plugin_utils.unsafe import ( TEST_MAKE_UNSAFE = [ ( - _make_trusted(u'text'), + _make_trusted('text'), [], [ (), ], ), ( - _make_trusted(u'{{text}}'), + _make_trusted('{{text}}'), [ (), ], @@ -116,7 +116,7 @@ def test_make_unsafe_idempotence(): def test_make_unsafe_dict_key(): value = { - _make_trusted(u'test'): 2, + _make_trusted('test'): 2, } if not SUPPORTS_DATA_TAGGING: value[_make_trusted(b"test")] = 1 @@ -126,7 +126,7 @@ def test_make_unsafe_dict_key(): assert _is_trusted(obj) value = { - _make_trusted(u'{{test}}'): 2, + _make_trusted('{{test}}'): 2, } if not SUPPORTS_DATA_TAGGING: value[_make_trusted(b"{{test}}")] = 1 @@ -137,7 +137,7 @@ def test_make_unsafe_dict_key(): def test_make_unsafe_set(): - value = set([_make_trusted(u'test')]) + value = set([_make_trusted('test')]) if not SUPPORTS_DATA_TAGGING: value.add(_make_trusted(b"test")) unsafe_value = make_unsafe(value) @@ -145,7 +145,7 @@ def test_make_unsafe_set(): for obj in unsafe_value: assert _is_trusted(obj) - value = set([_make_trusted(u'{{test}}')]) + value = set([_make_trusted('{{test}}')]) if not SUPPORTS_DATA_TAGGING: value.add(_make_trusted(b"{{test}}")) unsafe_value = make_unsafe(value)