! F tidy upgrades to Python 3.10

The linter cleaned a bunch of stuff

In test_verify we fixed the import of `List`.

Co-Authored-By: Llewellyn Falco <llewellyn.falco@gmail.com>
Co-Authored-By: reyr-dev <236299828+reyr-dev@users.noreply.github.com>

Author: 3 people

approval_utilities/list_utils.py

@@ -1,9 +1,8 @@
-from typing import Any, Callable, Iterable, Optional
+from collections.abc import Callable, Iterable
+from typing import Any
 
 
-def format_list(
-    alist: Iterable[Any], formatter: Optional[Callable], header: str
-) -> str:
+def format_list(alist: Iterable[Any], formatter: Callable | None, header: str) -> str:
     if formatter is None:
         formatter = FormatLineItem().print_item
     text = (header + "\n\n") if header else ""

approval_utilities/utilities/deprecated.py

@@ -1,6 +1,6 @@
 import functools
 import warnings
-from typing import Callable
+from collections.abc import Callable
 
 
 def deprecated(reason: str) -> Callable:

approval_utilities/utilities/exceptions/exception_collector.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable, List, Sequence
+from collections.abc import Callable, Sequence
+from typing import Any
 
 from approval_utilities.utilities.exceptions.multiple_exceptions import (
     MultipleExceptions,
@@ -7,7 +8,7 @@
 
 class ExceptionCollector:
     def __init__(self) -> None:
-        self._exceptions: List[Exception] = []
+        self._exceptions: list[Exception] = []
 
     def gather(self, code_to_execute: Callable[[], Any]) -> None:
         try:

approval_utilities/utilities/exceptions/multiple_exceptions.py

@@ -1,4 +1,4 @@
-from typing import Sequence
+from collections.abc import Sequence
 
 from approval_utilities.utilities.exceptions.exception_utils import to_string
 

approval_utilities/utilities/logger/logging_instance.py

@@ -1,8 +1,9 @@
 import datetime
 import inspect
 import traceback
+from collections.abc import Callable, Iterable
 from types import TracebackType
-from typing import Any, Callable, ContextManager, Iterable, Optional, Type, Union
+from typing import Any, ContextManager
 
 from approval_utilities.utilities.exceptions.exception_utils import to_string
 from approval_utilities.utilities.stack_frame_utilities import get_class_name_for_frame
@@ -31,7 +32,7 @@ class LoggingInstance:
     def __init__(self) -> None:
         self.log_stack_traces = True
         self.toggles = Toggles(True)
-        self.previous_timestamp: Optional[datetime.datetime] = None
+        self.previous_timestamp: datetime.datetime | None = None
         self.logger: Callable[[str], None] = lambda t: print(t, end="")
         self.tabbing: int = 0
         self.counter = 0
@@ -55,17 +56,17 @@ def __enter__(self) -> None:
 
             def __exit__(
                 self,
-                exc_type: Optional[Type[BaseException]],
-                exc_val: Optional[BaseException],
-                exc_tb: Optional[TracebackType],
+                exc_type: type[BaseException] | None,
+                exc_val: BaseException | None,
+                exc_tb: TracebackType | None,
             ) -> None:
                 self.log.tabbing -= 1
 
         return Indent(self)
 
     def use_markers(
         self,
-        parameter_text: Optional[Union[str, Callable[[], str]]] = None,
+        parameter_text: str | Callable[[], str] | None = None,
         additional_stack: int = 0,
     ) -> ContextManager[None]:
         class Nothing:
@@ -74,9 +75,9 @@ def __enter__(self) -> None:
 
             def __exit__(
                 self,
-                exc_type: Optional[type],
-                exc_val: Optional[BaseException],
-                exc_tb: Optional[TracebackType],
+                exc_type: type | None,
+                exc_val: BaseException | None,
+                exc_tb: TracebackType | None,
             ) -> None:
                 pass
 
@@ -98,9 +99,9 @@ def __enter__(self) -> None:
 
             def __exit__(
                 self,
-                exc_type: Optional[type],
-                exc_val: Optional[BaseException],
-                exc_tb: Optional[TracebackType],
+                exc_type: type | None,
+                exc_val: BaseException | None,
+                exc_tb: TracebackType | None,
             ) -> None:
                 self.log.tabbing = self.log.tabbing - 1
                 expected = f"<- out: {self.method_name}({self.get_parameters(True)})"
@@ -201,8 +202,8 @@ def message(self, message: str) -> None:
 
     def warning(
         self,
-        text: Union[str, BaseException] = "",
-        exception: Optional[BaseException] = None,
+        text: str | BaseException = "",
+        exception: BaseException | None = None,
     ) -> None:
         if isinstance(text, Exception):
             temp = ""

approval_utilities/utilities/logger/simple_logger.py

@@ -1,5 +1,6 @@
 import threading
-from typing import Any, Callable, ContextManager, Optional, Union
+from collections.abc import Callable
+from typing import Any, ContextManager
 
 from approval_utilities.utilities.logger.logging_instance import LoggingInstance
 from approval_utilities.utilities.string_wrapper import StringWrapper
@@ -24,7 +25,7 @@ def log_to_string(log_separate_threads: bool = True) -> StringWrapper:
 
     @staticmethod
     def use_markers(
-        parameter_text: Optional[Union[str, Callable[[], str]]] = None,
+        parameter_text: str | Callable[[], str] | None = None,
     ) -> ContextManager[None]:
         return SimpleLogger._wrapper.get().use_markers(
             parameter_text, additional_stack=1
@@ -56,7 +57,7 @@ def message(message: str) -> None:
 
     @staticmethod
     def warning(
-        text: Union[str, BaseException] = "", exception: Optional[BaseException] = None
+        text: str | BaseException = "", exception: BaseException | None = None
     ) -> None:
         SimpleLogger._wrapper.get().warning(text, exception)
 

approval_utilities/utilities/map_reduce.py

@@ -1,13 +1,14 @@
 import itertools
-from typing import Any, Callable, Dict, Generator, Sequence
+from collections.abc import Callable, Generator, Sequence
+from typing import Any
 
 
 def first(sequence: Sequence[Any], predicate: Callable[[Any], bool]) -> Any:
     matching = filter(predicate, sequence)
     return next(matching, None)
 
 
-def product_dict(**kwargs: Sequence[Any]) -> Generator[Dict[str, Any], None, None]:
+def product_dict(**kwargs: Sequence[Any]) -> Generator[dict[str, Any], None, None]:
     """
     Similar to `itertools.product`, but the resulting combinations retain the names.
     """

approval_utilities/utilities/markdown_table.py

@@ -1,4 +1,5 @@
-from typing import TYPE_CHECKING, Any, Callable, Iterable
+from collections.abc import Callable, Iterable
+from typing import TYPE_CHECKING, Any
 
 from typing_extensions import override
 

approval_utilities/utilities/multiline_string_utils.py

@@ -1,8 +1,7 @@
 import textwrap
-from typing import Optional
 
 
-def remove_indentation_from(text: Optional[str]) -> str:
+def remove_indentation_from(text: str | None) -> str:
     if not text:
         return ""
     cleaned = textwrap.dedent(text + "|")

approval_utilities/utilities/os_utilities.py

@@ -1,7 +1,6 @@
 import subprocess
-from typing import List
 
 
-def run_command(command_array: List[str]) -> None:
+def run_command(command_array: list[str]) -> None:
     with subprocess.Popen(command_array):
         pass