mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-28 06:28:56 +00:00
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.
This commit is contained in:
parent
f5943201b9
commit
3478863ef0
77 changed files with 196 additions and 222 deletions
|
|
@ -10,7 +10,8 @@ from ansible.errors import AnsibleFilterError
|
|||
|
||||
|
||||
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 @@ class FilterModule:
|
|||
|
||||
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 @@ class FilterModule:
|
|||
|
||||
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 @@ class FilterModule:
|
|||
|
||||
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(
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue