repo: Apply PEP 604 for optional and union types

From Python 3.10 union types can be written with the | operator, and is
the preferred notation for linters.

Replace `Optional[type]` with `type | None`.
Replace `Union[X, Y]` with `X | Y`

Signed-off-by: Pieter De Gendt <[email protected]>

Author: pdgendt

src/west/app/main.py

@@ -26,7 +26,7 @@
 from io import StringIO
 from pathlib import Path, PurePath
 from subprocess import CalledProcessError
-from typing import NamedTuple, Optional
+from typing import NamedTuple
 
 import colorama
 
@@ -84,9 +84,9 @@ class EarlyArgs(NamedTuple):
     # Expected arguments:
     help: bool                  # True if -h was given
     version: bool               # True if -V was given
-    zephyr_base: Optional[str]  # -z argument value
+    zephyr_base: str | None     # -z argument value
     verbosity: int              # 0 if not given, otherwise counts
-    command_name: Optional[str]
+    command_name: str | None
 
     # Other arguments are appended here.
     unexpected_arguments: list[str]

src/west/commands.py

@@ -18,7 +18,7 @@
 from enum import IntEnum
 from pathlib import Path
 from types import ModuleType
-from typing import Callable, NoReturn, Optional
+from typing import Callable, NoReturn
 
 import colorama
 import pykwalify
@@ -152,7 +152,7 @@ def __init__(self, name: str, help: str, description: str,
         self.accepts_unknown_args: bool = accepts_unknown_args
         self.requires_workspace = requires_workspace
         self.verbosity = verbosity
-        self.topdir: Optional[str] = None
+        self.topdir: str | None = None
         self.manifest = None
         self.config = None
         self._hooks: list[Callable[[WestCommand], None]] = []
@@ -170,8 +170,8 @@ def add_pre_run_hook(self,
 
     def run(self, args: argparse.Namespace, unknown: list[str],
             topdir: PathType,
-            manifest: Optional[Manifest] = None,
-            config: Optional[Configuration] = None) -> None:
+            manifest: Manifest | None = None,
+            config: Configuration | None = None) -> None:
         '''Run the command.
 
         This raises `west.commands.CommandContextError` if the command
@@ -269,7 +269,7 @@ def _get_manifest(self) -> Manifest:
                      'Try "west -vv manifest --validate" to debug.')
         return self._manifest
 
-    def _set_manifest(self, manifest: Optional[Manifest]):
+    def _set_manifest(self, manifest: Manifest | None):
         self._manifest = manifest
 
     # Do not use @property decorator syntax to avoid a false positive
@@ -294,7 +294,7 @@ def _get_config(self) -> Configuration:
                      "variables, which were not available.")
         return self._config
 
-    def _set_config(self, config: Optional[Configuration]):
+    def _set_config(self, config: Configuration | None):
         self._config = config
 
     config = property(_get_config, _set_config)
@@ -602,7 +602,7 @@ class WestExtCommandSpec:
     factory: _ExtFactory
 
 def extension_commands(config: Configuration,
-                       manifest: Optional[Manifest] = None):
+                       manifest: Manifest | None = None):
     # Get descriptions of available extension commands.
     #
     # The return value is an ordered map from project paths to lists of

src/west/configuration.py

@@ -42,7 +42,7 @@
 from collections.abc import Iterable
 from enum import Enum
 from pathlib import Path, PureWindowsPath
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 from west.util import WEST_DIR, PathType, WestNotFound, west_dir
 
@@ -67,7 +67,7 @@ def parse_key(dotted_name: str):
         return section_child
 
     @staticmethod
-    def from_path(path: Optional[Path]) -> Optional['_InternalCF']:
+    def from_path(path: Path | None) -> '_InternalCF | None':
         return _InternalCF(path) if path and path.exists() else None
 
     def __init__(self, path: Path):
@@ -160,7 +160,7 @@ class Configuration:
 
     '''
 
-    def __init__(self, topdir: Optional[PathType] = None):
+    def __init__(self, topdir: PathType | None = None):
         '''Load the system, global, and workspace configurations and
         make them available for the user.
 
@@ -179,8 +179,8 @@ def __init__(self, topdir: Optional[PathType] = None):
         self._local = _InternalCF.from_path(self._local_path)
 
     def get(self, option: str,
-            default: Optional[str] = None,
-            configfile: ConfigFile = ConfigFile.ALL) -> Optional[str]:
+            default: str | None = None,
+            configfile: ConfigFile = ConfigFile.ALL) -> str | None:
         '''Get a configuration option's value as a string.
 
         :param option: option to get, in 'foo.bar' form
@@ -204,8 +204,8 @@ def getboolean(self, option: str,
         return self._get(lambda cf: cf.getboolean(option), default, configfile)
 
     def getint(self, option: str,
-               default: Optional[int] = None,
-               configfile: ConfigFile = ConfigFile.ALL) -> Optional[int]:
+               default: int | None = None,
+               configfile: ConfigFile = ConfigFile.ALL) -> int | None:
         '''Get a configuration option's value as an int.
 
         :param option: option to get, in 'foo.bar' form
@@ -215,8 +215,8 @@ def getint(self, option: str,
         return self._get(lambda cf: cf.getint(option), default, configfile)
 
     def getfloat(self, option: str,
-                 default: Optional[float] = None,
-                 configfile: ConfigFile = ConfigFile.ALL) -> Optional[float]:
+                 default: float | None = None,
+                 configfile: ConfigFile = ConfigFile.ALL) -> float | None:
         '''Get a configuration option's value as a float.
 
         :param option: option to get, in 'foo.bar' form
@@ -306,7 +306,7 @@ def _create(path: Path) -> _InternalCF:
         return ret
 
     def delete(self, option: str,
-               configfile: Optional[ConfigFile] = None) -> None:
+               configfile: ConfigFile | None = None) -> None:
         '''Delete an option from the given file or files.
 
         If *option* is not set in the given *configfile*, KeyError is raised.
@@ -401,7 +401,7 @@ def _local_as_dict(self):
         return self._cf_to_dict(self._local)
 
     @staticmethod
-    def _cf_to_dict(cf: Optional[_InternalCF]) -> dict[str, Any]:
+    def _cf_to_dict(cf: _InternalCF | None) -> dict[str, Any]:
         ret: dict[str, Any] = {}
         if cf is None:
             return ret
@@ -423,9 +423,9 @@ def _deprecated(old_function):
                   'use a west.configuration.Configuration object',
                   DeprecationWarning, stacklevel=2)
 
-def read_config(configfile: Optional[ConfigFile] = None,
+def read_config(configfile: ConfigFile | None = None,
                 config: configparser.ConfigParser = config,
-                topdir: Optional[PathType] = None) -> None:
+                topdir: PathType | None = None) -> None:
     '''Read configuration files into *config*.
 
     Reads the files given by *configfile*, storing the values into the
@@ -458,7 +458,7 @@ def read_config(configfile: Optional[ConfigFile] = None,
 
 def update_config(section: str, key: str, value: Any,
                   configfile: ConfigFile = ConfigFile.LOCAL,
-                  topdir: Optional[PathType] = None) -> None:
+                  topdir: PathType | None = None) -> None:
     '''Sets ``section.key`` to *value* in the given configuration file.
 
     :param section: config section; will be created if it does not exist
@@ -493,8 +493,8 @@ def update_config(section: str, key: str, value: Any,
         config.write(f)
 
 def delete_config(section: str, key: str,
-                  configfile: Union[Optional[ConfigFile], list[ConfigFile]] = None,
-                  topdir: Optional[PathType] = None) -> None:
+                  configfile: ConfigFile | list[ConfigFile] | None = None,
+                  topdir: PathType | None = None) -> None:
     '''Delete the option section.key from the given file or files.
 
     :param section: section whose key to delete
@@ -556,7 +556,7 @@ def delete_config(section: str, key: str,
     if not found:
         raise KeyError(f'{section}.{key}')
 
-def _location(cfg: ConfigFile, topdir: Optional[PathType] = None,
+def _location(cfg: ConfigFile, topdir: PathType | None = None,
               find_local: bool = True) -> str:
     # Making this a function that gets called each time you ask for a
     # configuration file makes it respect updated environment
@@ -628,7 +628,7 @@ def _location(cfg: ConfigFile, topdir: Optional[PathType] = None,
     else:
         raise ValueError(f'invalid configuration file {cfg}')
 
-def _gather_configs(cfg: ConfigFile, topdir: Optional[PathType]) -> list[str]:
+def _gather_configs(cfg: ConfigFile, topdir: PathType | None) -> list[str]:
     # Find the paths to the given configuration files, in increasing
     # precedence order.
     ret = []
@@ -645,7 +645,7 @@ def _gather_configs(cfg: ConfigFile, topdir: Optional[PathType]) -> list[str]:
 
     return ret
 
-def _ensure_config(configfile: ConfigFile, topdir: Optional[PathType]) -> str:
+def _ensure_config(configfile: ConfigFile, topdir: PathType | None) -> str:
     # Ensure the given configfile exists, returning its path. May
     # raise permissions errors, WestNotFound, etc.
     loc = _location(configfile, topdir=topdir)