fix collections.abc.Callable and typing.Callable

Author: KotlinIsland

stdlib/@tests/test_cases/check_collections_abc.py

@@ -0,0 +1,17 @@
+from __future__ import annotations
+
+from collections.abc import Callable
+from typing_extensions import assert_type
+
+assert_type(Callable[[], None], type[Callable[[], None]])
+
+
+def f(c: Callable[[], None]) -> None:
+    assert_type(c.__call__, Callable[[], None])
+
+
+class C(Callable[[], None]):
+    def __call__(self) -> None: ...
+
+
+isinstance(C(), Callable)

stdlib/_collections_abc.pyi

@@ -1,5 +1,5 @@
 import sys
-from abc import abstractmethod
+from abc import ABCMeta, abstractmethod
 from types import MappingProxyType
 from typing import (  # noqa: Y022,Y038,UP035,Y057,RUF100
     AbstractSet as Set,
@@ -8,7 +8,6 @@ from typing import (  # noqa: Y022,Y038,UP035,Y057,RUF100
     AsyncIterator as AsyncIterator,
     Awaitable as Awaitable,
     ByteString as ByteString,
-    Callable as Callable,
     ClassVar,
     Collection as Collection,
     Container as Container,
@@ -25,6 +24,7 @@ from typing import (  # noqa: Y022,Y038,UP035,Y057,RUF100
     MutableMapping as MutableMapping,
     MutableSequence as MutableSequence,
     MutableSet as MutableSet,
+    ParamSpec,
     Protocol,
     Reversible as Reversible,
     Sequence as Sequence,
@@ -68,6 +68,16 @@ if sys.version_info >= (3, 12):
 _KT_co = TypeVar("_KT_co", covariant=True)  # Key type covariant containers.
 _VT_co = TypeVar("_VT_co", covariant=True)  # Value type covariant containers.
 
+_R_co = TypeVar("_R_co", covariant=True)  # return type for Callable
+_P = ParamSpec("_P")
+
+@runtime_checkable
+class Callable(Protocol[_P, _R_co], metaclass=ABCMeta):
+    __slots__ = ()
+
+    @abstractmethod
+    def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R_co: ...
+
 @final
 class dict_keys(KeysView[_KT_co], Generic[_KT_co, _VT_co]):  # undocumented
     def __eq__(self, value: object, /) -> bool: ...

stdlib/typing.pyi

@@ -233,7 +233,6 @@ class _SpecialForm(_Final):
 
 Union: _SpecialForm
 Protocol: _SpecialForm
-Callable: _SpecialForm
 Type: _SpecialForm
 NoReturn: _SpecialForm
 ClassVar: _SpecialForm
@@ -427,6 +426,7 @@ class _Alias:
     # Class for defining generic aliases for library types.
     def __getitem__(self, typeargs: Any) -> Any: ...
 
+Callable = _Alias()
 List = _Alias()
 Dict = _Alias()
 DefaultDict = _Alias()