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
tyralla wants to merge 10 commits into from
Closed

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

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
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
Also filter externally defined self types (preliminary approach)
  • Loading branch information
@tyralla
tyralla committed Apr 15, 2023
commit 3097ac258e059da79c9e9836983aada2d764f054
29 changes: 22 additions & 7 deletions mypy/typeops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ def type_object_type_from_function(
# ...
#
# We need to map B's __init__ to the type (List[T]) -> None.
signature = bind_self(signature, original_type=default_self, is_classmethod=is_new)
signature = bind_self(
signature, original_type=default_self, is_classmethod=is_new, selftypes=orig_self_types
)
signature = cast(FunctionLike, map_type_from_supertype(signature, info, def_info))

special_sig: str | None = None
Expand Down Expand Up @@ -251,7 +253,12 @@ def supported_self_type(typ: ProperType) -> bool:
F = TypeVar("F", bound=FunctionLike)


def bind_self(method: F, original_type: Type | None = None, is_classmethod: bool = False) -> F:
def bind_self(
method: F,
original_type: Type | None = None,
is_classmethod: bool = False,
selftypes: list[Type | None] | None = None,
) -> F:
"""Return a copy of `method`, with the type of its first parameter (usually
self or cls) bound to original_type.

Expand Down Expand Up @@ -282,14 +289,22 @@ class B(A): pass
origtype = get_proper_type(original_type)
if isinstance(origtype, Instance):
methoditems = []
for mi in method.items:
selftype = get_proper_type(mi.arg_types[0])
if not isinstance(selftype, Instance) or is_subtype(
origtype, selftype, ignore_type_vars=False
if selftypes is not None:
selftypes_copy = selftypes.copy()
selftypes.clear()
for idx, methoditem in enumerate(method.items):
selftype = get_self_type(methoditem, origtype)
selftype_proper = get_proper_type(selftype)
if not isinstance(selftype_proper, Instance) or is_subtype(
origtype, selftype_proper, ignore_type_vars=False
):
methoditems.append(mi)
methoditems.append(methoditem)
if selftypes is not None:
selftypes.append(selftypes_copy[idx])
if len(methoditems) == 0:
methoditems = method.items
if selftypes is not None:
selftypes.extend(selftypes_copy)
else:
methoditems = method.items
return cast(
Expand Down