gh-157056: Fix STRING format for comprehension and lambda annotations - #157151
Closed
KingLizard1020 wants to merge 11 commits into
Closed
gh-157056: Fix STRING format for comprehension and lambda annotations#157151KingLizard1020 wants to merge 11 commits into
KingLizard1020 wants to merge 11 commits into
Conversation
…ations get_annotations(..., format=Format.STRING) raised ValueError on dict comprehension annotations because fake-globals iteration cannot unpack pair targets. Recover the annotation text from source in that case. Lambda and generator-expression annotations are syntax, so they were stringified with repr() and leaked a memory address. Prefer the source text when available, and use a stable type_repr() otherwise.
…ations get_annotations(..., format=Format.STRING) raised ValueError on dict comprehension annotations because fake-globals iteration cannot unpack pair targets. Recover the annotation text from source in that case. Lambda and generator-expression annotations are syntax, so they were stringified with repr() and leaked a memory address. Prefer the source text when available, and use a stable type_repr() otherwise.
…ations get_annotations(..., format=Format.STRING) raised ValueError on dict comprehension annotations because fake-globals iteration cannot unpack pair targets. Recover the annotation text from source in that case. Lambda and generator-expression annotations are syntax, so they were stringified with repr() and leaked a memory address. Prefer the source text when available, and use a stable type_repr() otherwise.
…ations get_annotations(..., format=Format.STRING) raised ValueError on dict comprehension annotations because fake-globals iteration cannot unpack pair targets. Recover the annotation text from source in that case. Lambda and generator-expression annotations are syntax, so they were stringified with repr() and leaked a memory address. Prefer the source text when available, and use a stable type_repr() otherwise.
|
All commit authors signed the Contributor License Agreement. |
KingLizard1020
marked this pull request as draft
September 8, 2026 01:37
Author
|
Closing this draft. The test file on this branch was accidentally truncated. The complete fix is in a follow-up PR from |
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
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 #157056
annotationlib.get_annotations(..., format=Format.STRING)failed in two ways for annotations that are not simple name lookups:{k: v for k, v in items}raisedValueError: not enough values to unpack, because fake-globals_Stringifier.__iter__yields a single starred node while the comprehension unpacks a pair.lambda q: q,(w for w in seq)) were stringified withrepr(), which embeds a memory address.This change recovers the original annotation text from the owner's source AST when fake-globals evaluation raises
ValueError, and when the evaluated value is a runtime-constructed function/generator._stringify_singlenow usestype_reprinstead ofrepr, andtype_reprhandles generator/coroutine objects via__qualname__so STRING output does not include0x...addresses.inspectis imported lazily inside the source-recovery helper becauseinspectimportsannotationlib.Tests:
./python -m test test_annotationlib test_inspect test_typing(debug build).