hotfix for 20445 #20450
Open
hotfix for 20445 #20450
+42
−29
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
randolf-scholz
commented
Dec 20, 2025
| proposed_type = make_simplified_union(proposed_items) | ||
|
|
||
| if isinstance(proper_type, AnyType): | ||
| return proposed_type, current_type |
Contributor
Author
There was a problem hiding this comment.
By the way, would it be technically more correct to return AnyType(TypeOfAny.from_another_any, source_any=proper_type) for the else branch, rather than proper_type itself?
randolf-scholz
commented
Dec 20, 2025
| return default, UninhabitedType() | ||
| elif not is_overlapping_types(current_type, proposed_type, ignore_promotions=True): | ||
| return default, remainder | ||
| if not is_overlapping_types(current_type, proposed_type, ignore_promotions=True): |
Contributor
Author
There was a problem hiding this comment.
Converted the elif to if because the if not any(type_range.is_upper_bound for type_range in proposed_type_ranges): is not guaranteed to return anymore.
randolf-scholz
commented
Dec 20, 2025
| ) | ||
| ): | ||
| # Expression is always of one of the types in proposed_type_ranges | ||
| return default, UninhabitedType() |
Contributor
Author
There was a problem hiding this comment.
This return was problematic in the structural case when current_type=Any | Proto, restricting Proto away should leave us with Any and not Never.
Contributor
|
According to mypy_primer, this change doesn't affect type check results on a corpus of open source code. ✅ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #20445
Fixes a regression in
conditional_typewhen given a union ofAny | Protocol