Merge pull request #579 from adanaja/type-fix

Cleanup most of Optional, Dict, List,... type hints

Author: pierretr

src/e3/anod/action/__init__.py

@@ -6,7 +6,7 @@
 from e3.anod.spec import Anod
 
 if TYPE_CHECKING:
-    from typing import Any, Final, Literal, Optional, Union
+    from typing import Any, Final, Literal, Union
     from e3.anod.package import Source, SourceBuilder
     from e3.collection.dag import DAG
 
@@ -418,7 +418,7 @@ class Decision(Action, metaclass=abc.ABCMeta):
     BOTH: Final = 2
 
     def __init__(
-        self, root: Action, left: Action, right: Action, choice: Optional[Choice] = None
+        self, root: Action, left: Action, right: Action, choice: Choice | None = None
     ):
         """Initialize a Decision instance.
 
@@ -430,11 +430,11 @@ def __init__(
         super().__init__(uid=root.uid + ".decision", data=None)
         self.initiator = root.uid
         self.choice = choice
-        self.expected_choice: Optional[Choice] = None
+        self.expected_choice: Choice | None = None
         self.left_action = left
         self.right_action = right
         self.triggers: list[tuple[str, Choice, str]] = []
-        self.decision_maker: Optional[str] = None
+        self.decision_maker: str | None = None
 
     @property
     def left(self) -> str:
@@ -474,7 +474,7 @@ def apply_triggers(self, dag: DAG) -> None:
                 elif self.expected_choice != decision:
                     self.expected_choice = Decision.BOTH
 
-    def get_decision(self) -> Optional[str]:
+    def get_decision(self) -> str | None:
         """Return uid of the choice made by the plan, or None.
 
         This function returns the choice made by the plan, if any.
@@ -501,7 +501,7 @@ def get_decision(self) -> Optional[str]:
             else:
                 return self.right
 
-    def get_expected_decision(self) -> Optional[str]:
+    def get_expected_decision(self) -> str | None:
         """Get expected decision.
 
         :return: uid of the expected action or None if no specific decision
@@ -514,7 +514,7 @@ def get_expected_decision(self) -> Optional[str]:
         else:
             return None
 
-    def set_decision(self, which: Choice, decision_maker: Optional[str]) -> None:
+    def set_decision(self, which: Choice, decision_maker: str | None) -> None:
         """Record a choice made by an action in a plan.
 
         This method should be caused when an entry in our plan
@@ -544,7 +544,7 @@ def description(cls, decision: Choice) -> str:
         """
         pass  # all: no cover
 
-    def suggest_plan_fix(self, choice: Choice) -> Optional[str]:
+    def suggest_plan_fix(self, choice: Choice) -> str | None:
         """Suggest a plan line that would fix the conflict.
 
         :param choice: Decision.LEFT or Decision.RIGHT

src/e3/anod/buildspace.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import os
-from typing import TYPE_CHECKING
 
 import e3.error
 import e3.log
@@ -12,10 +11,6 @@
 logger = e3.log.getLogger("buildspace")
 
 
-if TYPE_CHECKING:
-    from typing import Optional
-
-
 class BuildSpace:
     """Build space located inside a sandbox."""
 
@@ -98,7 +93,7 @@ def create(self, quiet: bool = False) -> None:
 
         self.initialized = True
 
-    def reset(self, keep: Optional[list[str]] = None) -> None:
+    def reset(self, keep: list[str] | None = None) -> None:
         """Reset build space.
 
         The function delete the complete buildspace. The only elements that

src/e3/anod/checkout.py

@@ -16,7 +16,7 @@
 from e3.vcs.svn import SVNError, SVNRepository
 
 if TYPE_CHECKING:
-    from typing import Literal, Optional
+    from typing import Literal
     from collections.abc import Callable
     from e3.mypy import assert_never
 
@@ -59,7 +59,7 @@ def update(
         self,
         vcs: Literal["git"] | Literal["svn"] | Literal["external"],
         url: str,
-        revision: Optional[str] = None,
+        revision: str | None = None,
     ) -> ReturnValue:
         """Update content of the working directory.
 
@@ -77,9 +77,7 @@ def update(
         if os.path.isfile(self.changelog_file):
             rm(self.changelog_file)
 
-        update: Callable[
-            [str, Optional[str]], tuple[ReturnValue, Optional[str], Optional[str]]
-        ]
+        update: Callable[[str, str | None], tuple[ReturnValue, str | None, str | None]]
         if vcs == "git":
             update = self.update_git
         elif vcs == "svn":
@@ -105,7 +103,7 @@ def update(
         return result
 
     def update_external(
-        self, url: str, revision: Optional[str]
+        self, url: str, revision: str | None
     ) -> tuple[ReturnValue, str, str]:
         """Update working dir using a local directory.
 
@@ -205,8 +203,8 @@ def git_remote_name(url: str) -> str:
         return hashlib.sha256(url.encode("utf-8")).hexdigest()
 
     def update_git(
-        self, url: str, revision: Optional[str]
-    ) -> tuple[ReturnValue, Optional[str], Optional[str]]:
+        self, url: str, revision: str | None
+    ) -> tuple[ReturnValue, str | None, str | None]:
         """Update working dir using a Git repository.
 
         :param url: git repository url
@@ -297,8 +295,8 @@ def update_git(
         return result, old_commit, new_commit
 
     def update_svn(
-        self, url: str, revision: Optional[str]
-    ) -> tuple[ReturnValue, Optional[str], Optional[str]]:
+        self, url: str, revision: str | None
+    ) -> tuple[ReturnValue, str | None, str | None]:
         """Update working dir using a SVN repository.
 
         :param url: git repository url

src/e3/anod/context.py

@@ -32,12 +32,7 @@
 from e3.error import E3Error
 
 if TYPE_CHECKING:
-    from typing import (
-        cast,
-        NoReturn,
-        Optional,
-        Tuple,
-    )
+    from typing import cast, NoReturn, Optional, Tuple
     from collections.abc import Callable
     from e3.anod.action import Action
     from e3.anod.package import SourceBuilder
@@ -64,9 +59,9 @@ class SchedulingError(E3Error):
     def __init__(
         self,
         message: str | list[str],
-        origin: Optional[str] = None,
-        uid: Optional[VertexID] = None,
-        initiators: Optional[list[VertexID]] = None,
+        origin: str | None = None,
+        uid: VertexID | None = None,
+        initiators: list[VertexID] | None = None,
     ):
         """Scheduling error initialization.
 
@@ -104,7 +99,7 @@ class AnodContext:
     def __init__(
         self,
         spec_repository: AnodSpecRepository,
-        default_env: Optional[BaseEnv] = None,
+        default_env: BaseEnv | None = None,
         reject_duplicates: bool = False,
     ):
         """Initialize a new context.
@@ -134,11 +129,11 @@ def __init__(
     def load(
         self,
         name: str,
-        env: Optional[BaseEnv],
-        qualifier: Optional[str],
+        env: BaseEnv | None,
+        qualifier: str | None,
         kind: PRIMITIVE,
-        sandbox: Optional[SandBox] = None,
-        source_name: Optional[str] = None,
+        sandbox: SandBox | None = None,
+        source_name: str | None = None,
     ) -> Anod:
         """Load a spec instance.
 
@@ -264,8 +259,8 @@ def link_to_plan(self, vertex_id: str, plan_line: str, plan_args: dict) -> None:
         self.tree.add_tag(vertex_id, {"plan_line": plan_line, "plan_args": plan_args})
 
     def add_plan_action(
-        self, plan_action_env: PlanActionEnv, sandbox: Optional[SandBox] = None
-    ) -> Optional[Action]:
+        self, plan_action_env: PlanActionEnv, sandbox: SandBox | None = None
+    ) -> Action | None:
         """Add an Anod action to the context.
 
         :param plan_action_env: the PlanActionEnv object as returned by PlanContext
@@ -307,12 +302,12 @@ def add_anod_action(
         name: str,
         env: BaseEnv,
         primitive: PRIMITIVE,
-        qualifier: Optional[str] = None,
-        source_packages: Optional[list[str]] = None,
+        qualifier: str | None = None,
+        source_packages: list[str] | None = None,
         upload: bool = True,
-        plan_line: Optional[str] = None,
-        plan_args: Optional[dict] = None,
-        sandbox: Optional[SandBox] = None,
+        plan_line: str | None = None,
+        plan_args: dict | None = None,
+        sandbox: SandBox | None = None,
     ) -> Action:
         """Add an Anod action to the context (internal function).
 
@@ -392,13 +387,13 @@ def add_spec(
         name: str,
         env: BaseEnv,
         primitive: PRIMITIVE,
-        qualifier: Optional[str] = None,
-        source_packages: Optional[list[str]] = None,
+        qualifier: str | None = None,
+        source_packages: list[str] | None = None,
         expand_build: bool = True,
-        source_name: Optional[str] = None,
-        plan_line: Optional[str] = None,
-        plan_args: Optional[dict] = None,
-        sandbox: Optional[SandBox] = None,
+        source_name: str | None = None,
+        plan_line: str | None = None,
+        plan_args: dict | None = None,
+        sandbox: SandBox | None = None,
         upload: bool = False,
         force_download: bool = False,
     ) -> Build | CreateSources | CreateSource | Install | Test:
@@ -424,7 +419,7 @@ def add_spec(
         :param force_download: if True force a download
         """
 
-        def add_action(data: Action, connect_with: Optional[Action] = None) -> None:
+        def add_action(data: Action, connect_with: Action | None = None) -> None:
             self.add(data)
             if connect_with is not None:
                 self.connect(connect_with, data)

src/e3/anod/deps.py

@@ -7,7 +7,7 @@
 from e3.env import BaseEnv
 
 if TYPE_CHECKING:
-    from typing import Any, Hashable, Literal, Optional
+    from typing import Any, Hashable, Literal
     from e3.anod.spec import Anod, DEPENDENCY_PRIMITIVE
     from e3.mypy import assert_never
 
@@ -36,12 +36,12 @@ class Dependency:
     def __init__(
         self,
         name: str,
-        product_version: Optional[str] = None,
-        host: Optional[str] = None,
-        target: Optional[str] = None,
-        build: Optional[str] = None,
-        qualifier: Optional[str] = None,
-        local_name: Optional[str] = None,
+        product_version: str | None = None,
+        host: str | None = None,
+        target: str | None = None,
+        build: str | None = None,
+        qualifier: str | None = None,
+        local_name: str | None = None,
         require: Literal["build_tree"]
         | Literal["installation"]
         | Literal["download"]

src/e3/anod/error.py

@@ -5,7 +5,6 @@
 import e3.error
 
 if TYPE_CHECKING:
-    from typing import Optional
     from e3.os.process import Run
 
 
@@ -33,8 +32,8 @@ class ShellError(AnodError):
     def __init__(
         self,
         message: str,
-        origin: Optional[str] = None,
-        process: Optional["Run"] = None,
+        origin: str | None = None,
+        process: "Run" | None = None,
     ):
         super().__init__(message, origin)
         self.process = process

src/e3/anod/helper.py

@@ -13,7 +13,6 @@
 from e3.os.fs import unixpath
 
 if TYPE_CHECKING:
-    from typing import Optional
     from e3.os.process import Run
 
 log = e3.log.getLogger("anod.helpers")
@@ -25,9 +24,9 @@ class Make:
     def __init__(
         self,
         anod_instance: Anod,
-        makefile: Optional[str] = None,
-        exec_dir: Optional[str] = None,
-        jobs: Optional[int] = None,
+        makefile: str | None = None,
+        exec_dir: str | None = None,
+        jobs: int | None = None,
         make_exe: str = "make",
     ):
         """Initialize a Make object.
@@ -49,7 +48,7 @@ def __init__(
         if jobs is None:
             self.jobs = anod_instance.jobs
         self.var_list = {}  # type: dict[str, str]
-        self.default_target = None  # type: Optional[str]
+        self.default_target = None  # type: str | None
         self.make_exe = make_exe
 
     def set_var(self, name: str, value: str | list[str]) -> None:
@@ -76,10 +75,10 @@ def set_default_target(self, target: str) -> None:
 
     def __call__(
         self,
-        target: Optional[str] = None,
-        jobs: Optional[int] = None,
-        exec_dir: Optional[str] = None,
-        timeout: Optional[float] = None,
+        target: str | None = None,
+        jobs: int | None = None,
+        exec_dir: str | None = None,
+        timeout: float | None = None,
     ) -> Run:
         """Call a make target.
 
@@ -95,10 +94,10 @@ def __call__(
 
     def cmdline(
         self,
-        target: Optional[str | list[str]] = None,
-        jobs: Optional[int] = None,
-        exec_dir: Optional[str] = None,
-        timeout: Optional[float] = None,
+        target: str | list[str] | None = None,
+        jobs: int | None = None,
+        exec_dir: str | None = None,
+        timeout: float | None = None,
     ) -> dict[str, list[str] | dict]:
         """Return the make command line.
 
@@ -147,8 +146,8 @@ class Configure:
     def __init__(
         self,
         anod_instance: Anod,
-        src_dir: Optional[str] = None,
-        exec_dir: Optional[str] = None,
+        src_dir: str | None = None,
+        exec_dir: str | None = None,
         auto_target: bool = True,
     ):
         """Initialize a Configure object.