Address issues reported by ruff check (#11043)

* Resolve E713 and E714 (not in/is tests).

* Address UP018 (unnecessary str call).

* UP045 requires Python 3.10+.

* Address UP007 (X | Y for type annotations).

* Address UP035 (import Callable from collections.abc).

* Address UP006 (t.Dict -> dict).

* Address UP009 (UTF-8 encoding comment).

* Address UP034 (extraneous parantheses).

* Address SIM910 (dict.get() with None default).

* Address F401 (unused import).

* Address UP020 (use builtin open).

* Address B009 and B010 (getattr/setattr with constant name).

* Address SIM300 (Yoda conditions).

* UP029 isn't in use anyway.

* Address FLY002 (static join).

* Address B034 (re.sub positional args).

* Address B020 (loop variable overrides input).

* Address B017 (assert raise Exception).

* Address SIM211 (if expression with false/true).

* Address SIM113 (enumerate for loop).

* Address UP036 (sys.version_info checks).

* Remove unnecessary UP039.

* Address SIM201 (not ==).

* Address SIM212 (if expr with twisted arms).

* Add changelog fragment.

* Reformat.

Author: felixfontein

changelogs/fragments/11043-ruff-check.yml

@@ -0,0 +1,64 @@
+bugfixes:
+  - timestamp callback plugin - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - wsl connection plugin - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - json_patch filter plugin - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - to_* time filter plugins - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - linode inventory plugin - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - _filelock module utils - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - btrfs module utils - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - module_helper module utils - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - oneandone module utils - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - opennebula module utils - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - ali_instance - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - ali_instance_info - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - apt_rpm - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - btrfs_subvolume - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - consul - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - cronvar - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - dnf_versionlock - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - dnsmadeeasy - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - gitlab_issue - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - gitlab_merge_request - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - gitlab_project - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - gitlab_user - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - haproxy - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - homebrew - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - homebrew_services - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - hpilo_boot - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - ini_file - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - ipa_otptoken - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - jenkins_credential - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - jenkins_plugin - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - kea_command - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - keycloak_authz_permission - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - keycloak_clientscope_type - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - keycloak_user_execute_actions_email - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - keycloak_user_federation - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - listen_ports_facts - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - lxc_container - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - lxd_container - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - matrix - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - maven_artifact - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - monit - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - netcup_dns - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - nmcli - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - nomad_job - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - npm - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - one_host - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - one_image - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - one_template - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - one_vm - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - one_vnet - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - onepassword_info - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - pamd - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - pkgin - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - pulp_repo - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - redhat_subscription - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - rhevm - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - sensu_check - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - simpleinit_msb - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - sorcery - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - terraform - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - timezone - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - xenserver_guest - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).
+  - zypper_repository - improve Python code (https://github.com/ansible-collections/community.general/pull/11043).

plugins/callback/timestamp.py

@@ -119,5 +119,5 @@ def set_options(self, task_keys=None, var_options=None, direct=None):
             tzinfo = ZoneInfo(self.get_option("timezone"))
 
         # Inject options into the display object
-        setattr(self._display, "timestamp_tzinfo", tzinfo)
-        setattr(self._display, "timestamp_format_string", self.get_option("format_string"))
+        self._display.timestamp_tzinfo = tzinfo
+        self._display.timestamp_format_string = self.get_option("format_string")

plugins/connection/wsl.py

@@ -416,7 +416,7 @@ def _parse_proxy_command(self, port: int = 22) -> dict[str, t.Any]:
 
         sock_kwarg = {}
         if proxy_command:
-            replacers: t.Dict[str, str] = {
+            replacers: dict[str, str] = {
                 "%h": self.get_option("remote_addr"),
                 "%p": str(port),
                 "%r": self.get_option("remote_user"),
@@ -457,7 +457,7 @@ def _connect(self) -> Connection:
         paramiko_preferred_pubkeys = getattr(paramiko.Transport, "_preferred_pubkeys", ())
         paramiko_preferred_hostkeys = getattr(paramiko.Transport, "_preferred_keys", ())
         use_rsa_sha2_algorithms = self.get_option("use_rsa_sha2_algorithms")
-        disabled_algorithms: t.Dict[str, t.Iterable[str]] = {}
+        disabled_algorithms: dict[str, t.Iterable[str]] = {}
         if not use_rsa_sha2_algorithms:
             if paramiko_preferred_pubkeys:
                 disabled_algorithms["pubkeys"] = tuple(a for a in paramiko_preferred_pubkeys if "rsa-sha2" in a)

plugins/filter/json_patch.py

@@ -10,7 +10,8 @@
 
 
 if t.TYPE_CHECKING:
-    from typing import Any, Callable, Union
+    from typing import Any
+    from collections.abc import Callable
 
 JSONPATCH_IMPORT_ERROR: ImportError | None
 try:
@@ -60,7 +61,7 @@ def check_patch_arguments(self, filter_name: str, args: dict):
 
     def json_patch(
         self,
-        inp: Union[str, list, dict, bytes, bytearray],
+        inp: str | list | dict | bytes | bytearray,
         op: str,
         path: str,
         value: Any = None,
@@ -105,7 +106,7 @@ def json_patch(
 
     def json_patch_recipe(
         self,
-        inp: Union[str, list, dict, bytes, bytearray],
+        inp: str | list | dict | bytes | bytearray,
         operations: list,
         /,
         fail_test: bool = False,
@@ -141,8 +142,8 @@ def json_patch_recipe(
 
     def json_diff(
         self,
-        inp: Union[str, list, dict, bytes, bytearray],
-        target: Union[str, list, dict, bytes, bytearray],
+        inp: str | list | dict | bytes | bytearray,
+        target: str | list | dict | bytes | bytearray,
     ) -> list:
         if not HAS_LIB:
             raise AnsibleFilterError(

plugins/filter/time.py

@@ -56,10 +56,8 @@ def to_time_unit(human_time, unit="ms", **kwargs):
     unit = unit_to_short_form.get(unit.rstrip("s"), unit)
     if unit not in unit_factors:
         raise AnsibleFilterError(
-            (
-                f"to_time_unit() can not convert to the following unit: {unit}. Available units (singular or plural):"
-                f"{', '.join(unit_to_short_form.keys())}. Available short units: {', '.join(unit_factors.keys())}"
-            )
+            f"to_time_unit() can not convert to the following unit: {unit}. Available units (singular or plural):"
+            f"{', '.join(unit_to_short_form.keys())}. Available short units: {', '.join(unit_factors.keys())}"
         )
 
     if "year" in kwargs:

plugins/inventory/linode.py

@@ -151,7 +151,7 @@ def _build_client(self, loader):
             access_token = self.templar.template(variable=access_token)
 
         if access_token is None:
-            raise AnsibleError(("Could not retrieve Linode access token from plugin configuration sources"))
+            raise AnsibleError("Could not retrieve Linode access token from plugin configuration sources")
 
         self.client = LinodeClient(access_token)
 

plugins/module_utils/_filelock.py

@@ -11,7 +11,6 @@
 import stat
 import time
 import fcntl
-import sys
 
 from contextlib import contextmanager
 
@@ -59,9 +58,6 @@ def set_lock(self, path, tmpdir, lock_timeout=None):
         """
         lock_path = os.path.join(tmpdir, f"ansible-{os.path.basename(path)}.lock")
         l_wait = 0.1
-        r_exception = IOError
-        if sys.version_info[0] == 3:
-            r_exception = BlockingIOError
 
         self.lockfd = open(lock_path, "w")
 
@@ -77,7 +73,7 @@ def set_lock(self, path, tmpdir, lock_timeout=None):
                     fcntl.flock(self.lockfd, fcntl.LOCK_EX | fcntl.LOCK_NB)
                     os.chmod(lock_path, stat.S_IWRITE | stat.S_IREAD)
                     return True
-                except r_exception:
+                except BlockingIOError:
                     time.sleep(l_wait)
                     e_secs += l_wait
                     continue

plugins/module_utils/btrfs.py

@@ -190,7 +190,7 @@ def is_mounted(self):
         return mountpoints is not None and len(mountpoints) > 0
 
     def is_filesystem_root(self):
-        return 5 == self.__subvolume_id
+        return self.__subvolume_id == 5
 
     def is_filesystem_default(self):
         return self.__filesystem.default_subvolid == self.__subvolume_id

plugins/module_utils/module_helper.py

@@ -7,12 +7,12 @@
 
 # pylint: disable=unused-import
 
-from ansible_collections.community.general.plugins.module_utils.mh.module_helper import (
+from ansible_collections.community.general.plugins.module_utils.mh.module_helper import (  # noqa: F401
     ModuleHelper,
     StateModuleHelper,
 )
 from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException  # noqa: F401
-from ansible_collections.community.general.plugins.module_utils.mh.deco import (
+from ansible_collections.community.general.plugins.module_utils.mh.deco import (  # noqa: F401
     cause_changes,
     module_fails_on_exception,
     check_mode_skip,

plugins/module_utils/oneandone.py

@@ -38,7 +38,7 @@ def get_resource(oneandone_conn, resource_type, resource_id):
         "vpn": oneandone_conn.get_vpn,
     }
 
-    return switcher.get(resource_type, None)(resource_id)
+    return switcher.get(resource_type)(resource_id)
 
 
 def get_datacenter(oneandone_conn, datacenter, full_object=False):