Modernize the code base

Author: idle-code

pyproject.toml

@@ -29,7 +29,7 @@ pathvalidate = "^3.1.0"
 mutagen = "^1.46.0"
 docstring-parser = "^0.16"
 python-magic = "^0.4.27"
-Pillow = "^10.0.0"
+Pillow = "^12.0.0"
 piexif = "^1.1.3"
 pymediainfo = {version = "^6.0.1", optional = true}
 isodate = "^0.6.1"

tempren/adhoc.py

@@ -1,6 +1,5 @@
 import subprocess
 from pathlib import Path
-from typing import Optional, Tuple
 
 from tempren.exceptions import ExecutionTimeoutError, MissingMetadataError
 from tempren.factories import TagFactoryFromClass
@@ -17,7 +16,7 @@ def short_description(self) -> str:
         return self._render_description(super().short_description)
 
     @property
-    def long_description(self) -> Optional[str]:
+    def long_description(self) -> str | None:
         long_description = super().long_description
         if long_description:
             long_description = self._render_description(long_description)
@@ -59,7 +58,7 @@ class AdHocTag(Tag):
     """
 
     executable: Path
-    args: Tuple[str, ...] = ()
+    args: tuple[str, ...] = ()
     timeout_ms: int = 3000
 
     def __init__(self, executable: Path):
@@ -76,7 +75,7 @@ def configure(self, *positional_args: str, timeout_ms: int = 3000):
         self.args = positional_args
         self.timeout_ms = timeout_ms
 
-    def process(self, file: File, context: Optional[str]) -> str:
+    def process(self, file: File, context: str | None) -> str:
         if context is None:
             command_line = (
                 [str(self.executable)] + list(self.args) + [str(file.relative_path)]

tempren/alias.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Type
+from typing import Any
 
 from tempren.factories import TagFactoryFromClass
 from tempren.primitives import File, Pattern, Tag, TagName
@@ -31,7 +31,7 @@ class AliasTag(Tag):
     def __init__(self, pattern: Pattern) -> None:
         self.pattern = pattern
 
-    def process(self, file: File, context: Optional[str]) -> Any:
+    def process(self, file: File, context: str | None) -> Any:
         return self.pattern.process(file)
 
 
@@ -46,7 +46,7 @@ def short_description(self) -> str:
         return self._render_description(super().short_description)
 
     @property
-    def long_description(self) -> Optional[str]:
+    def long_description(self) -> str | None:
         long_description = super().long_description
         assert long_description, "AliasTag description changed"
         long_description = self._render_description(long_description)
@@ -74,7 +74,7 @@ class AliasTagFactoryFromClass(AliasTagFactory):
 
     _tag_alias_suffix = "TagAlias"
 
-    def __init__(self, tag_alias_class: Type[TagAlias], compiler: TemplateCompiler):
+    def __init__(self, tag_alias_class: type[TagAlias], compiler: TemplateCompiler):
         class_name = tag_alias_class.__name__
         if class_name.endswith(self._tag_alias_suffix):
             alias_tag_name = TagName(class_name[: -len(self._tag_alias_suffix)])

tempren/cli.py

@@ -5,12 +5,13 @@
 import shutil
 import sys
 from argparse import ArgumentParser, Namespace
+from collections.abc import Sequence
 from enum import IntEnum
 from itertools import chain
 from logging import LogRecord
 from pathlib import Path
 from textwrap import indent
-from typing import Any, Dict, List, NoReturn, Optional, Sequence, Text, Tuple, Union
+from typing import Any, NoReturn
 
 from tempren.exceptions import FileNotSupportedError, TemplateEvaluationError
 from tempren.filesystem import DestinationAlreadyExistsError
@@ -87,7 +88,7 @@ def tag_name_from_executable(exec_path: Path) -> str:
     return base_name
 
 
-def adhoc_tag(val: str) -> Tuple[TagName, Path]:
+def adhoc_tag(val: str) -> tuple[TagName, Path]:
     val = nonempty_string(val)
     components = val.split("=", maxsplit=1)
     if len(components) == 1:
@@ -109,7 +110,7 @@ def adhoc_tag(val: str) -> Tuple[TagName, Path]:
         raise argparse.ArgumentTypeError(f"'{tag_name}' cannot be used as tag name")
 
 
-def alias(val: str) -> Tuple[TagName, str]:
+def alias(val: str) -> tuple[TagName, str]:
     val = nonempty_string(val)
     components = val.split("=", maxsplit=1)
     if len(components) < 2:
@@ -126,8 +127,8 @@ def alias(val: str) -> Tuple[TagName, str]:
 
 
 def validate_adhoc_tags(
-    adhoc_tags: List[List[Tuple[TagName, Path]]]
-) -> Dict[TagName, Path]:
+    adhoc_tags: list[list[tuple[TagName, Path]]]
+) -> dict[TagName, Path]:
     if not adhoc_tags:
         return dict()
     list_of_tuples = list(chain(*adhoc_tags))
@@ -152,7 +153,7 @@ def validate_adhoc_tags(
     return dict(list_of_tuples)
 
 
-def validate_aliases(aliases: List[List[Tuple[TagName, str]]]) -> Dict[TagName, str]:
+def validate_aliases(aliases: list[list[tuple[TagName, str]]]) -> dict[TagName, str]:
     # TODO: Merge with validate_adhoc_tags
     if not aliases:
         return dict()
@@ -182,7 +183,7 @@ def validate_aliases(aliases: List[List[Tuple[TagName, str]]]) -> Dict[TagName,
 class SystemExitError(Exception):  # TODO: Use ConfigurationError instead
     status: int
 
-    def __init__(self, status: int, message: Optional[str]):
+    def __init__(self, status: int, message: str | None):
         super().__init__(message)
         self.status = status
 
@@ -192,8 +193,8 @@ def __call__(
         self,
         parser: ArgumentParser,
         args: Namespace,
-        values: Union[Text, Sequence[Any], None],
-        option_string: Optional[Text] = None,
+        values: str | Sequence[Any] | None,
+        option_string: str | None = None,
     ):
         registry = build_tag_registry(
             validate_adhoc_tags(args.ad_hoc), validate_aliases(args.alias)
@@ -227,8 +228,8 @@ def __call__(
         self,
         parser: ArgumentParser,
         args: Namespace,
-        values: Union[str, Sequence[Any], None],
-        option_string: Optional[Text] = None,
+        values: str | Sequence[Any] | None,
+        option_string: str | None = None,
     ):
         if values is None:
             parser.print_help()
@@ -268,8 +269,8 @@ def __call__(
         self,
         parser: ArgumentParser,
         namespace: Namespace,
-        values: Union[Text, Sequence[Any], None],
-        option_string: Optional[Text] = None,
+        values: str | Sequence[Any] | None,
+        option_string: str | None = None,
     ):
         log.info(self.find_package_version())
         parser.exit()
@@ -290,8 +291,8 @@ def __call__(
         self,
         parser: ArgumentParser,
         namespace: Namespace,
-        values: Union[Text, Sequence[Any], None],
-        option_string: Optional[Text] = None,
+        values: str | Sequence[Any] | None,
+        option_string: str | None = None,
     ):
         root_logger = logging.getLogger()
         root_logger.setLevel(root_logger.level - 10)
@@ -303,8 +304,8 @@ def __call__(
         self,
         parser: ArgumentParser,
         namespace: Namespace,
-        values: Union[Text, Sequence[Any], None],
-        option_string: Optional[Text] = None,
+        values: str | Sequence[Any] | None,
+        option_string: str | None = None,
     ):
         root_logger = logging.getLogger()
         root_logger.setLevel(root_logger.level + 10)
@@ -320,7 +321,7 @@ def _get_help_string(self, action):
         return action.help
 
 
-def process_cli_configuration(argv: List[str]) -> RuntimeConfiguration:
+def process_cli_configuration(argv: list[str]) -> RuntimeConfiguration:
     log.debug("Parsing command line arguments")
     parser = argparse.ArgumentParser(
         prog="tempren",
@@ -520,7 +521,7 @@ def process_cli_configuration(argv: List[str]) -> RuntimeConfiguration:
     # We could catch resulting `SystemExit` exception but related error message still would be missing.
     # This behaviour is not comfortable for testing so here we monkeypatch exit method to
     # throw more practical exception instead.
-    def throwing_exit(status: int = 0, message: Optional[str] = "") -> NoReturn:
+    def throwing_exit(status: int = 0, message: str | None = "") -> NoReturn:
         raise SystemExitError(status, message)
 
     parser.exit = throwing_exit  # type: ignore
@@ -602,7 +603,7 @@ def render_template_evaluation_error(
 
 def cli_prompt_conflict_resolver(
     source_path: Path, destination_path: Path
-) -> Union[ConflictResolutionStrategy, Path]:
+) -> ConflictResolutionStrategy | Path:
     log.warning("While processing:")
     log.warning(f"  {source_path}")
     log.warning("following path was generated:")

tempren/discovery.py

@@ -3,29 +3,30 @@
 import logging
 import pkgutil
 from collections import defaultdict
+from collections.abc import Callable
 from types import ModuleType
-from typing import Callable, Dict, List, Type, TypeVar
+from typing import TypeVar
 
 from tempren.alias import TagAlias
 from tempren.primitives import CategoryName, Tag
 
 log = logging.getLogger(__name__)
 
 
-def discover_tags_in_package(package) -> Dict[CategoryName, List[Type[Tag]]]:
+def discover_tags_in_package(package) -> dict[CategoryName, list[type[Tag]]]:
     return _discover_classes_in_package(package, Tag)
 
 
-def discover_aliases_in_package(package) -> Dict[CategoryName, List[Type[TagAlias]]]:
+def discover_aliases_in_package(package) -> dict[CategoryName, list[type[TagAlias]]]:
     return _discover_classes_in_package(package, TagAlias)
 
 
 BaseClass = TypeVar("BaseClass")
 
 
 def _discover_classes_in_package(
-    package, base_klass: Type[BaseClass]
-) -> Dict[CategoryName, List[Type[BaseClass]]]:
+    package, base_klass: type[BaseClass]
+) -> dict[CategoryName, list[type[BaseClass]]]:
     def _is_base_class(klass: type):
         if (
             not inspect.isclass(klass)

tempren/factories.py

@@ -1,5 +1,4 @@
 import textwrap
-from typing import Optional, Type
 
 from docstring_parser import parse as parse_docstring
 
@@ -9,7 +8,7 @@
 class TagFactoryFromClass(TagFactory):
     """Produces tag instances by instantiating provided python class"""
 
-    _tag_class: Type[Tag]
+    _tag_class: type[Tag]
     _tag_name: TagName
 
     @property
@@ -50,7 +49,7 @@ def _create_configuration_signature(self) -> str:
         single_line_signature = f"%{self._tag_name}{signature_str}{context_metavar}"
         return single_line_signature
 
-    def _create_arguments_description(self) -> Optional[str]:
+    def _create_arguments_description(self) -> str | None:
         argument_description = []
         for argument in self._parsed_configure_docstring.params:
             argument_description.append(f"{argument.arg_name} - {argument.description}")
@@ -65,10 +64,10 @@ def short_description(self) -> str:
         return ""
 
     @property
-    def long_description(self) -> Optional[str]:
+    def long_description(self) -> str | None:
         return self._parsed_class_docstring.long_description
 
-    def __init__(self, tag_class: Type[Tag], tag_name: TagName):
+    def __init__(self, tag_class: type[Tag], tag_name: TagName):
         self._tag_class = tag_class
         self._tag_name = tag_name
         self._parsed_class_docstring = parse_docstring(

tempren/file_filters.py

@@ -2,7 +2,7 @@
 import logging
 import re
 from abc import ABC, abstractmethod
-from typing import Callable
+from collections.abc import Callable
 
 from tempren.evaluation import evaluate_expression
 from tempren.exceptions import ExpressionEvaluationError, TemplateEvaluationError

tempren/file_sorters.py

@@ -1,6 +1,6 @@
 import logging
 from abc import ABC, abstractmethod
-from typing import Iterable, Tuple
+from collections.abc import Iterable
 
 from tempren.evaluation import evaluate_expression
 from tempren.exceptions import ExpressionEvaluationError, TemplateEvaluationError
@@ -27,7 +27,7 @@ def __init__(self, pattern: Pattern, invert: bool = False):
     def __call__(self, files: Iterable[File]) -> Iterable[File]:
         return sorted(files, key=self._generate_sort_key, reverse=self.invert)
 
-    def _generate_sort_key(self, file: File) -> Tuple:
+    def _generate_sort_key(self, file: File) -> tuple:
         self.log.debug("Rendering sorting value template for '%s'", file)
         rendered_expression = "(" + self.pattern.process_as_expression(file) + ", )"
         self.log.debug("Evaluating sorting value expression '%s'", rendered_expression)

tempren/filesystem.py

@@ -2,8 +2,8 @@
 import os
 import shutil
 from abc import ABC, abstractmethod
+from collections.abc import Callable, Iterable
 from pathlib import Path
-from typing import Callable, Iterable, List, Set
 
 from tempren.primitives import File
 
@@ -109,7 +109,7 @@ def _gather_in(self, directory: Path) -> Iterable[File]:
 
 
 class ExplicitFileGatherer(FileGatherer):
-    def __init__(self, files: List[Path]):
+    def __init__(self, files: list[Path]):
         self._files_to_provide = files
 
     def gather_files(self) -> Iterable[File]:
@@ -127,7 +127,7 @@ def include_hidden(self, include: bool):
         for gatherer in self._gatherers:
             gatherer.include_hidden = include
 
-    def __init__(self, gatherers: List[FileGatherer]):
+    def __init__(self, gatherers: list[FileGatherer]):
         if not gatherers:
             raise ValueError("No subsequent file gatherers provided")
         self._gatherers = gatherers
@@ -168,8 +168,8 @@ def __call__(
 
 class DryRunRenamer:
     def __init__(self):
-        self.removed_paths: Set[Path] = set()
-        self.created_paths: Set[Path] = set()
+        self.removed_paths: set[Path] = set()
+        self.created_paths: set[Path] = set()
 
     def __call__(
         self,