8000 Fix type argument inference for overloaded functions with explicit self types (Fixes #14943). by tyralla · Pull Request #14975 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Fix type argument inference for overloaded functions with explicit self types (Fixes #14943). #14975

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

Closed
wants to merge 10 commits into from
Closed

Fix type argument inference for overloaded functions with explicit self types (Fixes #14943). #14975

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4b1fe1c
Fix type argument inference for overloaded functions with explicit se…
tyralla Mar 29, 2023
f354153
revert first attempt
tyralla Apr 10, 2023
589e0c6
try filtering in `bind_self` instead
tyralla Apr 10, 2023
9c107b3
black
tyralla Apr 10, 2023
b143796
flake
tyralla Apr 10, 2023
6b1573f
Simplify `checker.TypeChecker.bind_and_map_method` and remove "xfail"…
tyralla Apr 14, 2023
f1414f2
Add `testSelfTypeOverrideCompatibilitySelfTypeVar` (not my work: take…
tyralla Apr 14, 2023
6e5476a
ignore_type_vars=False for testing
tyralla Apr 15, 2023
3097ac2
Also filter externally defined self types (preliminary approach)
tyralla Apr 15, 2023
33a1f96
reverse ignore_type_vars=False
tyralla Apr 15, 2023
8000
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
Prev Previous commit
Next Next commit
Simplify checker.TypeChecker.bind_and_map_method and remove "xfail"… 
… from `testSelfTypeOverrideCompatibilityTypeVar`
  • Loading branch information
@tyralla
tyralla committed Apr 14, 2023
commit 6b1573fe2043c85f87f06900dd6b078ad9a5d8b1
22 changes: 2 additions & 20 deletions mypy/checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1940,35 +1940,17 @@ def bind_and_map_method(
sub_info: class where the method is used
super_info: class where the method was defined
"""
mapped_typ = cast(FunctionLike, map_type_from_supertype(typ, sub_info, super_info))
if isinstance(sym.node, (FuncDef, OverloadedFuncDef, Decorator)) and not is_static(
sym.node
):
if isinstance(sym.node, Decorator):
is_class_method = sym.node.func.is_class
else:
is_class_method = sym.node.is_class

mapped_typ = cast(FunctionLike, map_type_from_supertype(typ, sub_info, super_info))
active_self_type = self.scope.active_self_type()
if isinstance(mapped_typ, Overloaded) and active_self_type:
# If we have an overload, filter to overloads that match the self type.
# This avoids false positives for concrete subclasses of generic classes,
# see testSelfTypeOverrideCompatibility for an example.
filtered_items = [
item
for item in mapped_typ.items
if not item.arg_types or is_subtype(active_self_type, item.arg_types[0])
]
# If we don't have any filtered_items, maybe it's always a valid override
# of the superclass? However if you get to that point you're in murky type
# territory anyway, so we just preserve the type and have the behaviour match
# that of older versions of mypy.
if filtered_items:
mapped_typ = Overloaded(filtered_items)

return bind_self(mapped_typ, active_self_type, is_class_method)
else:
return cast(FunctionLike, map_type_from_supertype(typ, sub_info, super_info))
return mapped_typ

def get_op_other_domain(self, tp: FunctionLike) -> Type | None:
if isinstance(tp, CallableType):
Expand Down
2 changes: 1 addition & 1 deletion test-data/unit/check-selftype.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class C(A[None]):
# N: def f(self, s: int) -> int
[builtins fixtures/tuple.pyi]

[case testSelfTypeOverrideCompatibilityTypeVar-xfail]
[case testSelfTypeOverrideCompatibilityTypeVar]
from typing import overload, TypeVar, Union

AT = TypeVar("AT", bound="A")
Expand Down
0