Modernize type hints to Python 3.10+ syntax using ruff

Author: jensens

src/mxdev/config.py

@@ -17,17 +17,17 @@ def to_bool(value):
 
 
 class Configuration:
-    settings: typing.Dict[str, str]
-    overrides: typing.Dict[str, str]
-    ignore_keys: typing.List[str]
-    packages: typing.Dict[str, typing.Dict[str, str]]
-    hooks: typing.Dict[str, typing.Dict[str, str]]
+    settings: dict[str, str]
+    overrides: dict[str, str]
+    ignore_keys: list[str]
+    packages: dict[str, dict[str, str]]
+    hooks: dict[str, dict[str, str]]
 
     def __init__(
         self,
         mxini: str,
-        override_args: typing.Dict = {},
-        hooks: typing.List["Hook"] = [],
+        override_args: dict = {},
+        hooks: list["Hook"] = [],
     ) -> None:
         logger.debug("Read configuration")
         data = read_with_included(mxini)
@@ -164,9 +164,9 @@ def out_constraints(self) -> str:
         return self.settings.get("constraints-out", "constraints-mxdev.txt")
 
     @property
-    def package_keys(self) -> typing.List[str]:
+    def package_keys(self) -> list[str]:
         return [k.lower() for k in self.packages]
 
     @property
-    def override_keys(self) -> typing.List[str]:
+    def override_keys(self) -> list[str]:
         return [k.lower() for k in self.overrides]

src/mxdev/hooks.py

@@ -30,11 +30,11 @@ def load_hooks() -> list:
     return [ep.load()() for ep in load_eps_by_group("mxdev") if ep.name == "hook"]
 
 
-def read_hooks(state: State, hooks: typing.List[Hook]) -> None:
+def read_hooks(state: State, hooks: list[Hook]) -> None:
     for hook in hooks:
         hook.read(state)
 
 
-def write_hooks(state: State, hooks: typing.List[Hook]) -> None:
+def write_hooks(state: State, hooks: list[Hook]) -> None:
     for hook in hooks:
         hook.write(state)

src/mxdev/including.py

@@ -10,10 +10,10 @@
 
 
 def resolve_dependencies(
-    file_or_url: typing.Union[str, Path],
+    file_or_url: str | Path,
     tmpdir: str,
     http_parent=None,
-) -> typing.List[Path]:
+) -> list[Path]:
     """Resolve dependencies of a file or url
 
     The result is a list of Path objects, starting with the
@@ -69,7 +69,7 @@ def resolve_dependencies(
     return file_list
 
 
-def read_with_included(file_or_url: typing.Union[str, Path]) -> ConfigParser:
+def read_with_included(file_or_url: str | Path) -> ConfigParser:
     """Read a file or url and include all referenced files,
 
     Parse the result as a ConfigParser and return it.

src/mxdev/processing.py

@@ -13,11 +13,11 @@
 
 def process_line(
     line: str,
-    package_keys: typing.List[str],
-    override_keys: typing.List[str],
-    ignore_keys: typing.List[str],
+    package_keys: list[str],
+    override_keys: list[str],
+    ignore_keys: list[str],
     variety: str,
-) -> typing.Tuple[typing.List[str], typing.List[str]]:
+) -> tuple[list[str], list[str]]:
     """Take line from a constraints or requirements file and process it recursively.
 
     The line is taken as is unless one of the following cases matches:
@@ -69,11 +69,11 @@ def process_line(
 
 def process_io(
     fio: typing.IO,
-    requirements: typing.List[str],
-    constraints: typing.List[str],
-    package_keys: typing.List[str],
-    override_keys: typing.List[str],
-    ignore_keys: typing.List[str],
+    requirements: list[str],
+    constraints: list[str],
+    package_keys: list[str],
+    override_keys: list[str],
+    ignore_keys: list[str],
     variety: str,
 ) -> None:
     """Read lines from an open file and trigger processing of each line
@@ -91,17 +91,17 @@ def process_io(
 
 def resolve_dependencies(
     file_or_url: str,
-    package_keys: typing.List[str],
-    override_keys: typing.List[str],
-    ignore_keys: typing.List[str],
+    package_keys: list[str],
+    override_keys: list[str],
+    ignore_keys: list[str],
     variety: str = "r",
-) -> typing.Tuple[typing.List[str], typing.List[str]]:
+) -> tuple[list[str], list[str]]:
     """Takes a file or url, loads it and trigger to recursivly processes its content.
 
     returns tuple of requirements and constraints
     """
-    requirements: typing.List[str] = []
-    constraints: typing.List[str] = []
+    requirements: list[str] = []
+    constraints: list[str] = []
     if not file_or_url.strip():
         logger.info("mxdev is configured to run without input requirements!")
         return ([], [])
@@ -210,7 +210,7 @@ def fetch(state: State) -> None:
     )
 
 
-def write_dev_sources(fio, packages: typing.Dict[str, typing.Dict[str, typing.Any]]):
+def write_dev_sources(fio, packages: dict[str, dict[str, typing.Any]]):
     """Create requirements configuration for fetched source packages."""
     if not packages:
         return
@@ -232,7 +232,7 @@ def write_dev_sources(fio, packages: typing.Dict[str, typing.Dict[str, typing.An
 
 
 def write_dev_overrides(
-    fio, overrides: typing.Dict[str, str], package_keys: typing.List[str]
+    fio, overrides: dict[str, str], package_keys: list[str]
 ):
     """Create requirements configuration for overridden packages."""
     fio.write("#" * 79 + "\n")
@@ -247,7 +247,7 @@ def write_dev_overrides(
     fio.write("\n\n")
 
 
-def write_main_package(fio, settings: typing.Dict[str, str]):
+def write_main_package(fio, settings: dict[str, str]):
     """Write main package if configured."""
     main_package = settings.get("main-package")
     if main_package:

src/mxdev/state.py

@@ -8,5 +8,5 @@
 @dataclass
 class State:
     configuration: Configuration
-    requirements: typing.List[str] = field(default_factory=list)
-    constraints: typing.List[str] = field(default_factory=list)
+    requirements: list[str] = field(default_factory=list)
+    constraints: list[str] = field(default_factory=list)

src/mxdev/vcs/bazaar.py

@@ -21,9 +21,9 @@ def bzr_branch(self, **kwargs):
         path = self.source["path"]
         url = self.source["url"]
         if os.path.exists(path):
-            self.output((logger.info, "Skipped branching existing package %r." % name))
+            self.output((logger.info, f"Skipped branching existing package {name!r}."))
             return
-        self.output((logger.info, "Branched %r with bazaar." % name))
+        self.output((logger.info, f"Branched {name!r} with bazaar."))
         env = dict(os.environ)
         env.pop("PYTHONPATH", None)
         cmd = subprocess.Popen(
@@ -42,7 +42,7 @@ def bzr_pull(self, **kwargs):
         name = self.source["name"]
         path = self.source["path"]
         url = self.source["url"]
-        self.output((logger.info, "Updated %r with bazaar." % name))
+        self.output((logger.info, f"Updated {name!r} with bazaar."))
         env = dict(os.environ)
         env.pop("PYTHONPATH", None)
         cmd = subprocess.Popen(
@@ -67,12 +67,12 @@ def checkout(self, **kwargs):
                 self.update(**kwargs)
             elif self.matches():
                 self.output(
-                    (logger.info, "Skipped checkout of existing package %r." % name)
+                    (logger.info, f"Skipped checkout of existing package {name!r}.")
                 )
             else:
                 raise BazaarError(
-                    "Source URL for existing package %r differs. "
-                    "Expected %r." % (name, self.source["url"])
+                    "Source URL for existing package {!r} differs. "
+                    "Expected {!r}.".format(name, self.source["url"])
                 )
         else:
             return self.bzr_branch(**kwargs)
@@ -115,8 +115,8 @@ def update(self, **kwargs):
         name = self.source["name"]
         if not self.matches():
             raise BazaarError(
-                "Can't update package %r because its URL doesn't match." % name
+                f"Can't update package {name!r} because its URL doesn't match."
             )
         if self.status() != "clean" and not kwargs.get("force", False):
-            raise BazaarError("Can't update package %r because it's dirty." % name)
+            raise BazaarError(f"Can't update package {name!r} because it's dirty.")
         return self.bzr_pull(**kwargs)