Skip to content

Commit

Permalink
Correctly handle cls in protocol classmethod (#11119)
Browse files Browse the repository at this point in the history
Closes #11115.

Correctly handle cls in generic classmethods of protocol. 

This should correctly handle cls in classmethods. Current behavior of not 
passing is_classmethod seems like an omission in implementation, so this 
should only correct buggy behavior and shouldn't break something else.

Adds a test case `testSelfTypeProtocolClassmethodMatch`.
  • Loading branch information
nullie authored Nov 19, 2021
1 parent e2178b8 commit 89bb94a
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
3 changes: 2 additions & 1 deletion mypy/subtypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,8 @@ def find_node_type(node: Union[Var, FuncBase], itype: Instance, subtype: Type) -
and node.is_initialized_in_class
and not node.is_staticmethod)):
assert isinstance(typ, FunctionLike)
signature = bind_self(typ, subtype)
signature = bind_self(typ, subtype,
is_classmethod=isinstance(node, Var) and node.is_classmethod)
if node.is_property:
assert isinstance(signature, CallableType)
typ = signature.ret_type
Expand Down
31 changes: 31 additions & 0 deletions test-data/unit/check-selftype.test
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,37 @@ class Bad(metaclass=Meta):
Good.do_x()
Bad.do_x() # E: Invalid self argument "Type[Bad]" to attribute function "do_x" with type "Callable[[Type[T]], T]"

[case testSelfTypeProtocolClassmethodMatch]
from typing import Type, TypeVar, Protocol

T = TypeVar('T')

class HasDoX(Protocol):
@classmethod
def do_x(cls: Type[T]) -> T:
...

class Good:
@classmethod
def do_x(cls) -> 'Good':
...

class Bad:
@classmethod
def do_x(cls) -> Good:
...

good: HasDoX = Good()
bad: HasDoX = Bad()
[builtins fixtures/classmethod.pyi]
[out]
main:21: error: Incompatible types in assignment (expression has type "Bad", variable has type "HasDoX")
main:21: note: Following member(s) of "Bad" have conflicts:
main:21: note: Expected:
main:21: note: def do_x(cls) -> Bad
main:21: note: Got:
main:21: note: def do_x(cls) -> Good

[case testSelfTypeNotSelfType]
# Friendlier error messages for common mistakes. See #2950
class A:
Expand Down

0 comments on commit 89bb94a

Please sign in to comment.