8000 Fix union inference of generic class and its generic type by arvi18 · Pull Request #5 · coderabbit-test/mypy · GitHub
[go: up one dir, main page]
Skip to content

Fix union inference of generic class and its generic type #5

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix union inference of generic class and its generic type #5

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1d5b92
Fix union inference of generic class and its generic type
roberfi Jun 1, 2024
2314852
Improve inference of union of generic types when one of the types is …
roberfi Jun 2, 2024
401eb22
Merge branch 'master' into fix_union_inference_of_generic_class_and_i…
roberfi Oct 24, 2024
133c49b
Fix 'overlapping' typo
roberfi Oct 26, 2024
4929815
Merge branch 'master' into fix_union_inference_of_generic_class_and_i…
roberfi Feb 18, 2025
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
Fix 'overlapping' typo
  • Loading branch information
@roberfi
roberfi committed Oct 26, 2024
commit 133c49b458e980b5ad154d4050b681fb2ac4eafe
20 changes: 10 additions & 10 deletions mypy/constraints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def infer_constraints(
actual: Type,
direction: int,
skip_neg_op: bool = False,
can_have_union_overlaping: bool = True,
can_have_union_overlapping: bool = True,
) -> list[Constraint]:
"""Infer type constraints.

Expand Down Expand Up @@ -318,15 +318,15 @@ def infer_constraints(
res = _infer_constraints(template, actual, direction, skip_neg_op)
type_state.inferring.pop()
return res
return _infer_constraints(template, actual, direction, skip_neg_op, can_have_union_overlaping)
return _infer_constraints(template, actual, direction, skip_neg_op, can_have_union_overlapping)


def _infer_constraints(
template: Type,
actual: Type,
direction: int,
skip_neg_op: bool,
can_have_union_overlaping: bool = True,
can_have_union_overlapping: bool = True,
) -> list[Constraint]:
orig_template = template
template = get_proper_type(template)
Expand Down Expand Up @@ -380,11 +380,11 @@ def _infer_constraints(
if direction == SUPERTYPE_OF and isinstance(actual, UnionType):
res = []

def _can_have_overlaping(_item: Type, _actual: UnionType) -> bool:
# There is a special overlaping case, where we have a Union of where two types
def _can_have_overlapping(_item: Type, _actual: UnionType) -> bool:
# There is a special overlapping case, where we have a Union of where two types
# are the same, but one of them contains the other.
# For example, we have Union[Sequence[T], Sequence[Sequence[T]]]
# In this case, only the second one can have overlaping because it contains the other.
# In this case, only the second one can have overlapping because it contains the other.
# So, in case of list[list[int]], second one would be chosen.
if isinstance(p_item := get_proper_type(_item), Instance) and p_item.args:
other_items = [o_item for o_item in _actual.items if o_item is not a_item]
Expand All @@ -411,7 +411,7 @@ def _can_have_overlaping(_item: Type, _actual: UnionType) -> bool:
orig_template,
a_item,
direction,
can_have_union_overlaping=_can_have_overlaping(a_item, actual),
can_have_union_overlapping=_can_have_overlapping(a_item, actual),
)
)
return res
Expand All @@ -435,8 +435,8 @@ def _can_have_overlaping(_item: Type, _actual: UnionType) -> bool:
# type variables indeterminate. This helps with some special
# cases, though this isn't very principled.

def _is_item_overlaping_actual_type(_item: Type) -> bool:
# Overlaping occurs when we have a Union where two types are
def _is_item_overlapping_actual_type(_item: Type) -> bool:
# Overlapping occurs when we have a Union where two types are
# compatible and the more generic one is chosen.
# For example, in Union[T, Sequence[T]], we have to choose
# Sequence[T] if actual type is list[int].
Expand All @@ -456,7 +456,7 @@ def _is_item_overlaping_actual_type(_item: Type) -> bool:
for t_item in [
item
for item in template.items
if not (can_have_union_overlaping and _is_item_overlaping_actual_type(item))
if not (can_have_union_overlapping and _is_item_overlapping_actual_type(item))
]
],
eager=False,
Expand Down
0