Cleanup: update use of typing in for Python scripts

tests/utils/batch_load_blendfiles.py

@@ -15,11 +15,8 @@ import os
 import sys
 import argparse
 
-from typing import (
-    Generator,
-    List,
-    Optional,
-    Tuple,
+from collections.abc import (
+    Iterator,
 )
 
 SOURCE_DIR = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")))
@@ -31,7 +28,7 @@ SORT_BY_FN = {
 }
 
 
-def blend_list(path: str) -> Generator[str, None, None]:
+def blend_list(path: str) -> Iterator[str]:
     for dirpath, dirnames, filenames in os.walk(path):
         # skip '.git'
         dirnames[:] = [d for d in dirnames if not d.startswith(".")]
@@ -53,7 +50,7 @@ def load_blend_file(filepath: str) -> None:
     bpy.ops.wm.open_mainfile(filepath=filepath)
 
 
-def load_files_immediately(blend_files: List[str], blend_file_index_offset: int) -> None:
+def load_files_immediately(blend_files: list[str], blend_file_index_offset: int) -> None:
     index = blend_file_index_offset
     for filepath in blend_files:
         print_load_message(filepath, index)
@@ -61,10 +58,10 @@ def load_files_immediately(blend_files: List[str], blend_file_index_offset: int)
         load_blend_file(filepath)
 
 
-def load_files_with_wait(blend_files: List[str], blend_file_index_offset: int, wait: float) -> None:
+def load_files_with_wait(blend_files: list[str], blend_file_index_offset: int, wait: float) -> None:
     index = 0
 
-    def load_on_timer() -> Optional[float]:
+    def load_on_timer() -> float | None:
         nonlocal index
         if index >= len(blend_files):
             sys.exit(0)
@@ -80,7 +77,7 @@ def load_files_with_wait(blend_files: List[str], blend_file_index_offset: int, w
     bpy.app.timers.register(load_on_timer, persistent=True)
 
 
-def argparse_handle_int_range(value: str) -> Tuple[int, int]:
+def argparse_handle_int_range(value: str) -> tuple[int, int]:
     range_beg, sep, range_end = value.partition(":")
     if not sep:
         raise argparse.ArgumentTypeError("Expected a \":\" separator!")
@@ -151,7 +148,7 @@ def argparse_create() -> argparse.ArgumentParser:
     return parser
 
 
-def main() -> Optional[int]:
+def main() -> int | None:
     try:
         argv_sep = sys.argv.index("--")
     except ValueError:

tests/utils/blender_headless.py

@@ -47,11 +47,10 @@ import tempfile
 
 from typing import (
     Any,
-    Dict,
+)
+from collections.abc import (
     Iterator,
-    Optional,
     Sequence,
-    Tuple,
 )
 
 
@@ -123,9 +122,9 @@ class backend_wayland(backend_base):
     @staticmethod
     def _weston_env_and_ini_from_portable(
             *,
-            wayland_root_dir: Optional[str],
-            weston_root_dir: Optional[str],
-    ) -> Tuple[Optional[Dict[str, str]], str]:
+            wayland_root_dir: str | None,
+            weston_root_dir: str | None,
+    ) -> tuple[dict[str, str] | None, str]:
         """
         Construct a portable environment to run WESTON in.
         """
@@ -212,7 +211,7 @@ class backend_wayland(backend_base):
         )
 
     @staticmethod
-    def _weston_env_and_ini_from_system() -> Tuple[Optional[Dict[str, str]], str]:
+    def _weston_env_and_ini_from_system() -> tuple[dict[str, str] | None, str]:
         weston_env = None
         weston_ini = [
             "[shell]",
@@ -227,7 +226,7 @@ class backend_wayland(backend_base):
         )
 
     @staticmethod
-    def _weston_env_and_ini() -> Tuple[Optional[Dict[str, str]], str]:
+    def _weston_env_and_ini() -> tuple[dict[str, str] | None, str]:
         wayland_root_dir = os.environ.get("WAYLAND_ROOT_DIR")
         weston_root_dir = os.environ.get("WESTON_ROOT_DIR")
 
@@ -262,7 +261,7 @@ class backend_wayland(backend_base):
             "--height=600",
             # `--config={..}` is added to point to a temp file.
         ]
-        cmd_kw: Dict[str, Any] = {}
+        cmd_kw: dict[str, Any] = {}
         if weston_env is not None:
             cmd_kw["env"] = weston_env
         if not VERBOSE: