Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make staticmethod/classmethod generic in their return type #6285

Merged
merged 2 commits into from
Nov 12, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions stdlib/builtins.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ _T4 = TypeVar("_T4")
_T5 = TypeVar("_T5")
_TT = TypeVar("_TT", bound="type")
_TBE = TypeVar("_TBE", bound="BaseException")
_R = TypeVar("_R") # Return-type TypeVar

class object:
__doc__: str | None
Expand Down Expand Up @@ -115,28 +116,28 @@ class object:
def __dir__(self) -> Iterable[str]: ...
def __init_subclass__(cls) -> None: ...

class staticmethod(object): # Special, only valid as a decorator.
__func__: Callable[..., Any]
class staticmethod(Generic[_R]): # Special, only valid as a decorator.
__func__: Callable[..., _R]
__isabstractmethod__: bool
def __init__(self, __f: Callable[..., Any]) -> None: ...
def __init__(self: staticmethod[_R], __f: Callable[..., _R]) -> None: ...
def __new__(cls: Type[_T], *args: Any, **kwargs: Any) -> _T: ...
def __get__(self, __obj: _T, __type: Type[_T] | None = ...) -> Callable[..., Any]: ...
def __get__(self, __obj: _T, __type: Type[_T] | None = ...) -> Callable[..., _R]: ...
if sys.version_info >= (3, 10):
__name__: str
__qualname__: str
__wrapped__: Callable[..., Any]
def __call__(self, *args: Any, **kwargs: Any) -> Any: ...
__wrapped__: Callable[..., _R]
def __call__(self, *args: Any, **kwargs: Any) -> _R: ...

class classmethod(object): # Special, only valid as a decorator.
__func__: Callable[..., Any]
class classmethod(Generic[_R]): # Special, only valid as a decorator.
__func__: Callable[..., _R]
__isabstractmethod__: bool
def __init__(self, __f: Callable[..., Any]) -> None: ...
def __init__(self: classmethod[_R], __f: Callable[..., _R]) -> None: ...
def __new__(cls: Type[_T], *args: Any, **kwargs: Any) -> _T: ...
def __get__(self, __obj: _T, __type: Type[_T] | None = ...) -> Callable[..., Any]: ...
def __get__(self, __obj: _T, __type: Type[_T] | None = ...) -> Callable[..., _R]: ...
if sys.version_info >= (3, 10):
__name__: str
__qualname__: str
__wrapped__: Callable[..., Any]
__wrapped__: Callable[..., _R]

class type(object):
__base__: type
Expand Down