Skip to content

Bind self correctly when mapping class methods from supertype #7474

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 5, 2019
Merged

Bind self correctly when mapping class methods from supertype #7474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
935e9ff
Bind self correctly when mapping class methods from supertype
Sep 5, 2019
7de627c
Address CR
Sep 5, 2019
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
8 changes: 7 additions & 1 deletion mypy/checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,7 +1530,13 @@ def bind_and_map_method(self, sym: SymbolTableNode, typ: FunctionLike,
"""
if (isinstance(sym.node, (FuncDef, OverloadedFuncDef, Decorator))
and not is_static(sym.node)):
bound = bind_self(typ, self.scope.active_self_type())
if isinstance(sym.node, Decorator):
is_class_method = sym.node.func.is_class
elif isinstance(sym.node, OverloadedFuncDef):
is_class_method = sym.node.is_class
else:
is_class_method = False
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we check is_class for regular FuncDefs? (It can be implicit for certain functions, right?)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, you are right, it is better to be on the safe side.

bound = bind_self(typ, self.scope.active_self_type(), is_class_method)
else:
bound = typ
return cast(FunctionLike, map_type_from_supertype(bound, sub_info, super_info))
Expand Down
49 changes: 49 additions & 0 deletions test-data/unit/check-generics.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2062,3 +2062,52 @@ class A:
x, y = A()
reveal_type(x) # N: Revealed type is 'Any'
reveal_type(y) # N: Revealed type is 'Any'

[case testSubclassingGenericSelfClassMethod]
from typing import TypeVar, Type

AT = TypeVar('AT', bound='A')

class A:
@classmethod
def from_config(cls: Type[AT]) -> AT:
...

class B(A):
@classmethod
def from_config(cls: Type[B]) -> B:
return B()
[builtins fixtures/classmethod.pyi]

[case testSubclassingGenericSelfClassMethodOptional]
# flags: --strict-optional
from typing import TypeVar, Type, Optional

AT = TypeVar('AT', bound='A')

class A:
@classmethod
def from_config(cls: Type[AT]) -> Optional[AT]:
return None

class B(A):
@classmethod
def from_config(cls: Type[B]) -> Optional[B]:
return B()
[builtins fixtures/classmethod.pyi]

[case testSubclassingGenericSelfClassMethodNonAnnotated]
from typing import TypeVar, Type

AT = TypeVar('AT', bound='A')

class A:
@classmethod
def from_config(cls: Type[AT]) -> AT:
...

class B(A):
@classmethod
def from_config(cls) -> B:
return B()
[builtins fixtures/classmethod.pyi]
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy