Skip to content

Fix TypeIs for types with type params in Unions #17232

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 14 commits into from
Closed

Fix TypeIs for types with type params in Unions #17232

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8bebb70
Fix TypeIs for types with type params in Unions
kreathon May 10, 2024
2aef4f3
Fix issues related to primer output
kreathon May 11, 2024
b1c6409
Merge branch 'master' into fix-typeis-for-types-with-type-params-in-u…
kreathon May 11, 2024
5c7fe48
Revert changes and only keep removal of type erase
kreathon May 14, 2024
4ee4771
Special handling fallback_to_any types
kreathon May 21, 2024
528410c
Fix UnionType recursion
kreathon May 21, 2024
44449cc
Make use of is_same_type
kreathon May 24, 2024
431d722
Fix self type check
kreathon May 24, 2024
6b933ef
Merge branch 'master' into fix-typeis-for-types-with-type-params-in-u…
kreathon May 24, 2024
80c093e
Merge branch 'master' into fix-typeis-for-types-with-type-params-in-u…
kreathon May 25, 2024
81dae26
Code clean-up
kreathon May 25, 2024
c9692c5
Add other test case to document current behaviour
kreathon May 26, 2024
3e0a92c
Merge branch 'master' into fix-typeis-for-types-with-type-params-in-u…
kreathon Aug 4, 2024
7cfdd8f
Merge branch 'master' into fix-typeis-for-types-with-type-params-in-u…
JelleZijlstra Oct 8, 2024
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
Special handling fallback_to_any types
  • Loading branch information
@kreathon
kreathon committed May 21, 2024
commit 4ee4771ae1f86460e05cb22642a71f4d4c98bc0e
7 changes: 5 additions & 2 deletions mypy/subtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1927,7 +1927,7 @@ def restrict_subtype_away(t: Type, s: Type) -> Type:
new_items = [
restrict_subtype_away(item, s)
for item in p_t.relevant_items()
if (isinstance(get_proper_type(item), AnyType) or not covers_type(item, s))
if not covers_type(item, s)
]
return UnionType.make_union(new_items)
elif covers_type(t, s):
Expand All @@ -1941,7 +1941,10 @@ def covers_type(item: Type, supertype: Type) -> bool:
item = get_proper_type(item)
supertype = get_proper_type(supertype)

if is_proper_subtype(item, supertype, ignore_promotions=True, erase_instances=True):
if isinstance(item, AnyType) or (isinstance(item, Instance) and item.type.fallback_to_any):
return False

if is_subtype(item, supertype, ignore_promotions=True):
return True
if isinstance(supertype, Instance):
if supertype.type.is_protocol:
Expand Down