Drop List from typing imports and use list and other types

Author: tfc

pkgs/by-name/ni/nix-required-mounts/nix-required-mounts/src/nix_required_mounts.py

@@ -10,11 +10,6 @@
 from itertools import chain
 from pathlib import Path, PurePath
 from typing import (
-    Deque,
-    Dict,
-    List,
-    Set,
-    Tuple,
     TypeAlias,
     TypedDict,
     Iterable,
@@ -31,12 +26,12 @@ class Mount(TypedDict):
 
 
 class Pattern(TypedDict):
-    onFeatures: List[str]
-    paths: List[Glob | Mount]
+    onFeatures: list[str]
+    paths: list[Glob | Mount]
     unsafeFollowSymlinks: bool
 
 
-AllowedPatterns: TypeAlias = Dict[str, Pattern]
+AllowedPatterns: TypeAlias = dict[str, Pattern]
 
 
 parser = ArgumentParser("pre-build-hook")
@@ -59,7 +54,7 @@ class Pattern(TypedDict):
 parser.add_argument("-v", "--verbose", action="count", default=0)
 
 
-def symlink_targets(p: Path) -> List[Path]:
+def symlink_targets(p: Path) -> list[Path]:
     """Traverses a chain of symlinks to collect every intermediate path up to the final destination."""
 
     out = []
@@ -84,7 +79,7 @@ def symlink_targets(p: Path) -> List[Path]:
     return out
 
 
-def symlink_closure(path: Path) -> List[Path]:
+def symlink_closure(path: Path) -> list[Path]:
     """Traverses all higher paths towards the final path. Returns all symlink targets on the way."""
     path_gen = (
         p
@@ -95,7 +90,7 @@ def symlink_closure(path: Path) -> List[Path]:
     return sum(map(symlink_targets, path_gen), [])
 
 
-def get_required_system_features(parsed_drv: dict) -> List[str]:
+def get_required_system_features(parsed_drv: dict) -> list[str]:
     # Newer versions of Nix (since https://github.com/NixOS/nix/pull/13263) store structuredAttrs
     # in the derivation JSON output.
     if "structuredAttrs" in parsed_drv:
@@ -114,8 +109,8 @@ def get_required_system_features(parsed_drv: dict) -> List[str]:
 
 def validate_mounts(
     pattern: Pattern,
-) -> List[Tuple[PathString, PathString, bool]]:
-    roots: List[Tuple[PathString, PathString, bool]] = []
+) -> list[tuple[PathString, PathString, bool]]:
+    roots: list[tuple[PathString, PathString, bool]] = []
     for mount in pattern["paths"]:
         if isinstance(mount, PathString):
             matches = glob.glob(mount)
@@ -141,9 +136,9 @@ def validate_mounts(
 
 
 def enumerate_patterns(
-    allowed_patterns: AllowedPatterns, required_features: List[str]
-) -> Iterable[Tuple[PathString, PathString, bool]]:
-    patterns: List[Pattern] = [
+    allowed_patterns: AllowedPatterns, required_features: list[str]
+) -> Iterable[tuple[PathString, PathString, bool]]:
+    patterns: list[Pattern] = [
         pattern
         for pattern in allowed_patterns.values()
         if any(
@@ -155,11 +150,11 @@ def enumerate_patterns(
 
 
 def discover_reachable_paths(
-    inputs: Iterable[Tuple[PathString, PathString, bool]],
-) -> List[Tuple[PathString, PathString]]:
-    queue: Deque[Tuple[PathString, PathString, bool]] = deque(inputs)
-    unique_mounts: Set[Tuple[PathString, PathString]] = set()
-    mounts: List[Tuple[PathString, PathString]] = []
+    inputs: Iterable[tuple[PathString, PathString, bool]],
+) -> list[tuple[PathString, PathString]]:
+    queue: deque[tuple[PathString, PathString, bool]] = deque(inputs)
+    unique_mounts: set[tuple[PathString, PathString]] = set()
+    mounts: list[tuple[PathString, PathString]] = []
 
     while queue:
         guest_path_str, host_path_str, follow_symlinks = queue.popleft()
@@ -190,8 +185,8 @@ def discover_reachable_paths(
 
 
 def prune_paths(
-    inputs: List[Tuple[PathString, PathString]],
-) -> List[Tuple[PathString, PathString]]:
+    inputs: list[tuple[PathString, PathString]],
+) -> list[tuple[PathString, PathString]]:
     if len(inputs) < 2:
         return inputs