Fixed tests and more Python version compatibility

Author: wolph

_python_utils_tests/test_aio.py

@@ -1,12 +1,14 @@
 from datetime import datetime
 import pytest
 import asyncio
+
+from python_utils import types
 from python_utils.aio import acount
 
 
 @pytest.mark.asyncio
 async def test_acount(monkeypatch: pytest.MonkeyPatch):
-    sleeps: list[float] = []
+    sleeps: types.List[float] = []
 
     async def mock_sleep(delay: float):
         sleeps.append(delay)

pytest.ini

@@ -7,7 +7,7 @@ addopts =
     --doctest-modules
     --cov python_utils
     --cov-report term-missing
-    --mypy
+;    --mypy
 
 doctest_optionflags =
     ALLOW_UNICODE

python_utils/containers.py

@@ -1,7 +1,6 @@
 # pyright: reportIncompatibleMethodOverride=false
 import abc
 import typing
-from typing import Any, Generator
 
 from . import types
 
@@ -15,18 +14,17 @@
 #: A type alias for a dictionary with keys of type KT and values of type VT.
 DT = types.Dict[KT, VT]
 #: A type alias for the casted type of a dictionary key.
-KT_cast = types.Optional[types.Callable[[Any], KT]]
+KT_cast = types.Optional[types.Callable[..., KT]]
 #: A type alias for the casted type of a dictionary value.
-VT_cast = types.Optional[types.Callable[[Any], VT]]
+VT_cast = types.Optional[types.Callable[..., VT]]
 #: A type alias for the hashable values of the `UniqueList`
 HT = types.TypeVar('HT', bound=types.Hashable)
 
 # Using types.Union instead of | since Python 3.7 doesn't fully support it
 DictUpdateArgs = types.Union[
-    types.Mapping[types.Any, types.Any],
-    types.Iterable[
-        types.Union[types.Tuple[Any, Any], types.Mapping[types.Any, types.Any]]
-    ],
+    types.Mapping[KT, VT],
+    types.Iterable[types.Tuple[KT, VT]],
+    types.Iterable[types.Mapping[KT, VT]],
     '_typeshed.SupportsKeysAndGetItem[KT, VT]',
 ]
 
@@ -56,7 +54,7 @@ def update(
             for key, value in kwargs.items():
                 self[key] = value
 
-    def __setitem__(self, key: Any, value: Any) -> None:
+    def __setitem__(self, key: types.Any, value: types.Any) -> None:
         if self._key_cast is not None:
             key = self._key_cast(key)
 
@@ -168,14 +166,16 @@ def __getitem__(self, key: types.Any) -> VT:
 
         return value
 
-    def items(self) -> Generator[tuple[KT, VT], None, None]:  # type: ignore
+    def items(  # type: ignore
+        self,
+    ) -> types.Generator[types.Tuple[KT, VT], None, None]:
         if self._value_cast is None:
             yield from super().items()
         else:
             for key, value in super().items():
                 yield key, self._value_cast(value)
 
-    def values(self) -> Generator[VT, None, None]:  # type: ignore
+    def values(self) -> types.Generator[VT, None, None]:  # type: ignore
         if self._value_cast is None:
             yield from super().values()
         else: