Unwrap type[Union[...]] when solving typevar constraints
#18266
Merged
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
This comment has been minimized.
This comment has been minimized.
|
Primer diff is fine, it was a false positive. |
JukkaL
reviewed
Dec 20, 2024
This comment has been minimized.
This comment has been minimized.
|
Hm, and this new diff is weird. I'll try to figure out the reason for the |
… be unwrapped, so type should be restored when passing it further
|
The upstream code has changed since, but I checked the previous version locally and confirmed the bug is gone. This should be ready for another review now. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
JukkaL
reviewed
Jan 10, 2025
mypy/constraints.py
Outdated
|
|
||
|
|
||
| def _unwrap_type_type(tp: TypeType | UnionType) -> ProperType: | ||
| """Rewrite `type[A] | type[B]` as `type[A | B]`. |
There was a problem hiding this comment.
The docstring seems incorrect or at least misleading. This converts type[A] | type[B] into A | B, right?
|
Diff from mypy_primer, showing the effect of this PR on open source code: Tanjun (https://github.com/FasterSpeeding/Tanjun)
- tanjun/annotations.py:1064: error: Incompatible return value type (got "object", expected "User | Role | Snowflake | _T") [return-value]
|
JukkaL
approved these changes
Jan 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Closes #18265, closes #12115.
type[A | B]is internally represented astype[A] | type[B], and this causes problems for a typevar solver. Prevent using meet in such cases by unwrapingtype[...]if both sides have such shape.