chore: update type imports to use collections.abc for Callable

Author: zoola969

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ on:
     branches: ["master"]
 
 permissions:
-    contents: read
+  contents: read
 
 jobs:
   tests:

cachium/_decorators.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from asyncio import iscoroutinefunction
+from collections.abc import Callable
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable, Protocol, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Protocol, TypeVar, cast
 
 from typing_extensions import ParamSpec
 

cachium/_helpers.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, NamedTuple, TypeVar, final, get_args, get_type_hints
+from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar, final, get_args, get_type_hints
 
 from typing_extensions import ParamSpec
 
 from cachium._errors import NoKwargsError
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable, Mapping, Sequence
+    from collections.abc import Callable, Iterable, Mapping, Sequence
 
 P = ParamSpec("P")
 T = TypeVar("T")

cachium/key_builders/_abc.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 TCacheKey: TypeAlias = str
 

cachium/key_builders/_default.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from typing_extensions import override
 
@@ -11,6 +11,8 @@
 from ._abc import KeyBuilder
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from cachium.serializers import Serializer
 
     from ._abc import TCacheKey

cachium/storages/ttl_map.py

@@ -6,7 +6,7 @@
 from asyncio import Condition as AsyncCondition
 from datetime import timedelta
 from threading import Condition
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 
 from ttlru_map import TTLMap
 from typing_extensions import override
@@ -16,6 +16,7 @@
 from ._abc import BaseAsyncLock, BaseAsyncStorage, BaseLock, BaseStorage, Result, TValue
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
     from types import TracebackType
 
     from typing_extensions import Self

tests/functions.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable, NamedTuple
+from collections.abc import Callable
+from typing import Any, NamedTuple
 
 
 class CallInfo(NamedTuple):

tests/test__default_key_builder.py

@@ -1,14 +1,17 @@
 from __future__ import annotations
 
 import inspect
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any
 
 import pytest
 
 from cachium.key_builders import DefaultKeyBuilder
 from cachium.serializers import StrSerializer
 from tests.functions import TestFunctions, func1
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 _TEST_FILE = inspect.getfile(func1)
 
 

tests/test__get_arg_default_value.py

@@ -1,5 +1,6 @@
 import inspect
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import pytest
 

tests/test__get_kwarg_default_value.py

@@ -1,5 +1,6 @@
 import inspect
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import pytest