From 44f4bc86127048fa8c67f8b68abd5d19f3ab8c6c Mon Sep 17 00:00:00 2001 From: correctmost <134317971+correctmost@users.noreply.github.com> Date: Sat, 16 Nov 2024 04:47:01 -0500 Subject: [PATCH] Use union syntax for isinstance checks (UP038 rule in Ruff) (#2829) --- archinstall/lib/general.py | 4 ++-- archinstall/lib/menu/abstract_menu.py | 2 +- archinstall/lib/output.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py index c34c2e79..aa07705a 100644 --- a/archinstall/lib/general.py +++ b/archinstall/lib/general.py @@ -70,9 +70,9 @@ def jsonify(obj: Any, safe: bool = True) -> Any: # a dictionary representation of the object so that it can be # processed by the json library. return jsonify(obj.json(), safe) - if isinstance(obj, (datetime, date)): + if isinstance(obj, datetime | date): return obj.isoformat() - if isinstance(obj, (list, set, tuple)): + if isinstance(obj, list | set | tuple): return [jsonify(item, safe) for item in obj] if isinstance(obj, pathlib.Path): return str(obj) diff --git a/archinstall/lib/menu/abstract_menu.py b/archinstall/lib/menu/abstract_menu.py index 2c1a90d2..6ec9bb75 100644 --- a/archinstall/lib/menu/abstract_menu.py +++ b/archinstall/lib/menu/abstract_menu.py @@ -131,7 +131,7 @@ class Selector: def is_empty(self) -> bool: if self.current_selection is None: return True - elif isinstance(self.current_selection, (str, list, dict)) and len(self.current_selection) == 0: + elif isinstance(self.current_selection, str | list | dict) and len(self.current_selection) == 0: return True return False diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py index d3ba4892..ba511116 100644 --- a/archinstall/lib/output.py +++ b/archinstall/lib/output.py @@ -103,7 +103,7 @@ class FormattedOutput: if '!' in key: value = '*' * len(value) - if isinstance(value, (int, float)) or (isinstance(value, str) and value.isnumeric()): + if isinstance(value, int | float) or (isinstance(value, str) and value.isnumeric()): obj_data.append(unicode_rjust(str(value), width)) else: obj_data.append(unicode_ljust(str(value), width))