refactor: Update type hints to use built-in types and improve imports

Author: thorwhalen

config2py/base.py

@@ -4,26 +4,24 @@
 
 from collections import ChainMap
 from typing import (
-    Callable,
     Type,
     Tuple,
     KT,
     VT,
     Any,
-    Iterable,
     Protocol,
     Union,
     runtime_checkable,
     Optional,
-    MutableMapping,
 )
+from collections.abc import Callable, Iterable, MutableMapping
 from dataclasses import dataclass
 from functools import lru_cache, partial
 
 from config2py.util import always_true, ask_user_for_input, no_default, not_found
 from config2py.errors import ConfigNotFound
 
-Exceptions = Tuple[Type[Exception], ...]
+Exceptions = tuple[type[Exception], ...]
 
 
 @runtime_checkable
@@ -104,8 +102,8 @@ def get_config(
     sources: Sources = None,
     *,
     default: VT = no_default,
-    egress: Optional[GetConfigEgress] = None,
-    val_is_valid: Optional[Callable[[VT], bool]] = always_true,
+    egress: GetConfigEgress | None = None,
+    val_is_valid: Callable[[VT], bool] | None = always_true,
     config_not_found_exceptions: Exceptions = (Exception,),
 ):
     """Get a config value from a list of sources
@@ -374,7 +372,7 @@ def ask_user_for_key(
     save_to: SaveTo = None,
     save_condition=is_not_empty,
     user_asker=ask_user_for_input,
-    egress: Optional[Callable] = None,
+    egress: Callable | None = None,
 ):
     if key is None:
         return partial(
@@ -399,7 +397,7 @@ def user_gettable(
     save_to: SaveTo = None,
     *,
     prompt_template="Enter a value for {}: ",
-    egress: Optional[Callable] = None,
+    egress: Callable | None = None,
     user_asker=ask_user_for_input,
     val_is_valid: Callable[[VT], bool] = is_not_empty,
     config_not_found_exceptions: Exceptions = (Exception,),

config2py/s_configparser.py

@@ -299,11 +299,11 @@ def __exit__(self, *exc_details):
 
     @persist_after_operation
     def __setitem__(self, k, v):
-        super(ConfigStore, self).__setitem__(k, v)
+        super().__setitem__(k, v)
 
     @persist_after_operation
     def __delitem__(self, k):
-        super(ConfigStore, self).__delitem__(k)
+        super().__delitem__(k)
 
     # __setitem__ = super_and_persist(ConfigParser, '__setitem__')
     # __delitem__ = super_and_persist(ConfigParser, '__delitem__')
@@ -388,13 +388,14 @@ def __delitem__(self, k):
 #             return super()._obj_of_data(data)
 
 
-from typing import Mapping, Iterable, Generator, Union
+from typing import Union
+from collections.abc import Mapping, Iterable, Generator
 import re
 
 
 # TODO: postprocess_ini_section_items and preprocess_ini_section_items: Add comma separated possibility?
 # TODO: Find out if configparse has an option to do this processing alreadys
-def postprocess_ini_section_items(items: Union[Mapping, Iterable]) -> Generator:
+def postprocess_ini_section_items(items: Mapping | Iterable) -> Generator:
     r"""Transform newline-separated string values into actual list of strings (assuming that intent)
 
     >>> section_from_ini = {
@@ -417,7 +418,7 @@ def postprocess_ini_section_items(items: Union[Mapping, Iterable]) -> Generator:
 
 
 # TODO: Find out if configparse has an option to do this processing alreadys
-def preprocess_ini_section_items(items: Union[Mapping, Iterable]) -> Generator:
+def preprocess_ini_section_items(items: Mapping | Iterable) -> Generator:
     """Transform list values into newline-separated strings, in view of writing the value to a ini formatted section
     >>> section = {
     ...     'name': 'aspyre',

config2py/tools.py

@@ -1,6 +1,6 @@
 """Various tools"""
 
-from typing import Callable
+from collections.abc import Callable
 from pathlib import Path
 import re
 from dol import Pipe, TextFiles, resolve_path

config2py/util.py

@@ -9,7 +9,8 @@
 from collections import ChainMap, namedtuple
 from pathlib import Path
 from functools import partial
-from typing import Optional, Union, Any, Callable, Set, Literal, get_args
+from typing import Optional, Union, Any, Set, Literal, get_args
+from collections.abc import Callable
 from types import SimpleNamespace
 import getpass
 
@@ -119,7 +120,7 @@ def ask_user_for_input(
 
 # Note: Could be made more efficient, but this is good enough (for now)
 def extract_variable_declarations(
-    string: str, expand: Optional[Union[dict, bool]] = None
+    string: str, expand: dict | bool | None = None
 ) -> dict:
     """
     Reads the contents of a config file, extracting Unix-style environment variable
@@ -554,7 +555,7 @@ def is_repl():
     return False
 
 
-is_repl.repl_conditions: Set[Callable] = _repl_conditions  # type: ignore
+is_repl.repl_conditions: set[Callable] = _repl_conditions  # type: ignore
 
 
 def _value_node_is_instance_of(