Merge branch 'mr/fix_RUF021_rule' into 'master'

Fix RUF021 rule

See merge request it/e3-core!413

Author: liaiss

src/e3/anod/store/__init__.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import json
 import os
 import sqlite3
@@ -2386,12 +2387,10 @@ def bulk_update_from_store(
                 query.update(unprocessed_query)
 
                 if not query["bid"] and "setup" in query:
-                    try:
+                    with contextlib.suppress(StoreError):
                         query["bid"] = from_store.get_latest_build_info(
                             setup=query["setup"], date=query.get("date")
                         )["_id"]
-                    except StoreError:
-                        pass
 
                 if query.get("bid"):
                     required_bids.add(query["bid"])

src/e3/anod/store/interface.py

@@ -10,12 +10,12 @@
 
 if TYPE_CHECKING:
     import os
+    from pathlib import Path
     from typing import Any, Literal, TypedDict, TypeVar
 
     from e3.anod.store.buildinfo import BuildInfoDict
     from e3.anod.store.component import ComponentDict
     from e3.anod.store.file import FileDict
-    from pathlib import Path
 
     StoreContextManagerType = TypeVar(
         "StoreContextManagerType", bound="_StoreContextManager"

src/e3/archive.py

@@ -129,10 +129,8 @@ def check_type(
     :return: the file extension
     """
     # Check extension
-    if (
-        filename.endswith(".tar.gz")
-        or filename.endswith(".tgz")
-        or (force_extension is not None and force_extension in [".tar.gz", ".tgz"])
+    if filename.endswith((".tar.gz", ".tgz")) or (
+        force_extension is not None and force_extension in [".tar.gz", ".tgz"]
     ):
         return "tar.gz"
     if filename.endswith(".tar.bz2") or (

src/e3/collection/dag.py

@@ -87,13 +87,10 @@ def next_element(
                 for node in self.non_visited:
                     minimal_cycle = self.dag.shortest_path(node, node)
                     if minimal_cycle is not None:
-                        raise DAGError(
-                            "cycle detected: {}".format(
-                                " -> ".join(
-                                    [str(vertex_id) for vertex_id in minimal_cycle]
-                                )
-                            )
+                        msg = "cycle detected: {}".format(
+                            " -> ".join([str(vertex_id) for vertex_id in minimal_cycle])
                         )
+                        raise DAGError(msg)
                 msg = "cycle detected (unknown error)"
                 raise DAGError(msg)
 
@@ -475,7 +472,7 @@ def shortest_path(
             # We have found our shortest path, so break
             if u == path_source:
                 break
-            elif u is None:
+            if u is None:
                 continue
 
             for u_pred in self.get_predecessors(u):

src/e3/fs.py

@@ -11,7 +11,6 @@
 import shutil
 import stat
 import sys
-from collections.abc import Iterable
 from pathlib import Path
 from platform import python_version
 from typing import TYPE_CHECKING, NamedTuple
@@ -33,7 +32,7 @@
 TIMESTAMP_TOLERANCE = 0.001
 
 if TYPE_CHECKING:
-    from collections.abc import Callable, Sequence
+    from collections.abc import Callable, Iterable, Sequence
     from typing import Any
 
 
@@ -621,12 +620,12 @@ def splitall(path: str | Path) -> tuple[str, ...]:
             # os.path.split('/') -> ('/', '')
             dirnames.append(head)
             break
-        elif tail == path:
+        if tail == path:
             # relative paths
             # os.path.split('..') -> ('', '..')
             dirnames.append(tail)
             break
-        elif tail == "":
+        if tail == "":
             # ending with a directory separator
             # os.path.split('a/b/c/') -> ('a/b/c', '')
             pass

src/e3/net/token.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import base64
+import contextlib
 import json
 
 from e3.date import utc_timestamp
@@ -26,10 +27,8 @@ def get_payload(token: str) -> dict:
         rem = len(payload) % 4
         if rem > 0:
             payload += "=" * (4 - rem)
-        try:
+        with contextlib.suppress(ValueError, TypeError):
             data = json.loads(base64.urlsafe_b64decode(payload).decode("utf-8"))
-        except (ValueError, TypeError):
-            pass
     return data
 
 

src/e3/python/pypi.py

@@ -74,7 +74,7 @@ def get_pip_env(platform: str, python_version: Version) -> dict[str, str]:
         result["sys_platform"] = "darwin"
     elif platform.endswith("-linux"):
         result["sys_platform"] = "linux"
-    elif platform.endswith("-windows") or platform.endswith("-windows64"):
+    elif platform.endswith(("-windows", "-windows64")):
         result["sys_platform"] = "win32"
     else:
         msg = f"Non supported platform {platform}"

src/e3/python/pypiscript.py

@@ -207,7 +207,7 @@ def main() -> None:
             pypi.add_wheel(wheel.path)
 
         for req in toplevel_reqs:
-            logger.info(f"Add top-level requirement {str(req)}")
+            logger.info(f"Add top-level requirement {req!s}")
             pypi.add_requirement(req)
 
         packages: set[str] = set()
@@ -232,4 +232,4 @@ def main() -> None:
                 if "discard_from_closure" not in config or not re.search(
                     config["discard_from_closure"], req.name
                 ):
-                    fd.write(f"{str(req)}\n")
+                    fd.write(f"{req!s}\n")

tests/tests_e3/archive/main_test.py

@@ -16,7 +16,7 @@
 import e3.os.fs
 
 
-@pytest.mark.parametrize("ext", (".tar.gz", ".tar.bz2", ".tar.xz", ".tar", ".zip"))
+@pytest.mark.parametrize("ext", [".tar.gz", ".tar.bz2", ".tar.xz", ".tar", ".zip"])
 def test_unpack(ext: str) -> None:
     """Test unpack."""
     dir_to_pack = str(Path(__file__).parent)
@@ -86,7 +86,7 @@ def test_unpack(ext: str) -> None:
         e3.fs.rm(dest, recursive=True)
 
 
-@pytest.mark.parametrize("ext", (".tar.gz", ".zip"))
+@pytest.mark.parametrize("ext", [".tar.gz", ".zip"])
 def test_unpack_fileobj(ext: str) -> None:
     """Test unpack fileobj."""
     dir_to_pack = str(Path(__file__).parent)