Fix variadic ParamSpec expansion crash - #21846
Open
KirschBluteX wants to merge 2 commits into
Open
Conversation
Expand unpacked TypeVarTuple parameters while preserving aligned argument types, kinds, and names. Fixes python#21778.
This comment has been minimized.
This comment has been minimized.
|
Looks good! |
Keep a residual unpack and its suffix together as one vararg when expanding Parameters. This avoids positional arguments after *args and preserves nested TypeVarTuple call semantics.
Contributor
|
According to mypy_primer, this change doesn't affect type check results on a corpus of open source code. ✅ |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #21778.
ExpandTypeVisitor.visit_parameterspreviously expanded parameter types independently from their kinds and names. A starredUnpack[TypeVarTuple]could therefore reach TypeVarTuple expansion with a concrete tuple replacement and raiseNotImplementedError. A nested expansion could also produce a concrete prefix, a residual unpack, and a concrete suffix; emitting that suffix as positional parameters after*argscreated an invalid parameter layout.This change expands a direct starred TypeVarTuple unpack while updating argument types, kinds, and names in lockstep. Concrete tuple items become positional parameters. When expansion leaves a residual variadic, that unpack and its suffix remain grouped as one starred tuple, preserving nested ParamSpec call semantics and the existing error-recovery path.
The regression tests cover the reported ParamSpec-based context-manager decorator, verify both the
with-target and decorated call types, and exercise a nestedprint_args(0, *args, "end")forwarding call whose revealed result retains the residualTypeVarTupleand suffix.Tests:
python -m pytest -n0 mypy/test/testcheck.py::TypeCheckSuite::check-parameter-specification.testpython -m pytest -n0 mypy/test/testcheck.py::TypeCheckSuite::check-typevar-tuple.test -k "ParamSpec or Unpack"python -m pytest -n0 mypy/test/testtypes.py -k expandpython -m mypy --config-file mypy_self_check.ini mypy/expandtype.pypython -m ruff check mypy/expandtype.py