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
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
try filtering in bind_self instead
  • Loading branch information
@tyralla
tyralla committed Apr 10, 2023
commit 589e0c66798fdee009473cb781758b7fe57a8676
7 changes: 7 additions & 0 deletions mypy/subtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def __init__(
# Supported for both proper and non-proper
ignore_promotions: bool = False,
ignore_uninhabited: bool = False,
ignore_type_vars: bool = False,
# Proper subtype flags
erase_instances: bool = False,
keep_erased_types: bool = False,
Expand All @@ -96,6 +97,7 @@ def __init__(
self.ignore_declared_variance = ignore_declared_variance
self.ignore_promotions = ignore_promotions
self.ignore_uninhabited = ignore_uninhabited
self.ignore_type_vars = ignore_type_vars
self.erase_instances = erase_instances
self.keep_erased_types = keep_erased_types
self.options = options
Expand All @@ -119,6 +121,7 @@ def is_subtype(
ignore_declared_variance: bool = False,
ignore_promotions: bool = False,
ignore_uninhabited: bool = False,
ignore_type_vars: bool = False,
options: Options | None = None,
) -> bool:
"""Is 'left' subtype of 'right'?
Expand All @@ -139,6 +142,7 @@ def is_subtype(
ignore_declared_variance=ignore_declared_variance,
ignore_promotions=ignore_promotions,
ignore_uninhabited=ignore_uninhabited,
ignore_type_vars=ignore_type_vars,
options=options,
)
else:
Expand Down Expand Up @@ -287,6 +291,9 @@ def _is_subtype(
# ErasedType as we do for non-proper subtyping.
return True

if subtype_context.ignore_type_vars and (isinstance(left, TypeVarType) or isinstance(right, TypeVarType)):
return True

if isinstance(right, UnionType) and not isinstance(left, UnionType):
# Normally, when 'left' is not itself a union, the only way
# 'left' can be a subtype of the union 'right' is if it is a
Expand Down
20 changes: 19 additions & 1 deletion mypy/typeops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,28 @@ class B(A): pass
b = B().copy() # type: B

"""

from mypy.subtypes import is_subtype

if isinstance(method, Overloaded):
# Try to remove overload items with non-matching self types first (fixes #14943)
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=True
):
methoditems.append(mi)
if len(methoditems) == 0:
methoditems = method.items
else:
methoditems = method.items
return cast(
F, Overloaded([bind_self(c, original_type, is_classmethod) for c in method.items])
F, Overloaded([bind_self(mi, original_type, is_classmethod) for mi in methoditems])
)

assert isinstance(method, CallableType)
func = method
if not func.arg_types:
Expand Down
0