gh-137969: Fix double evaluation of ForwardRefs which rely on globals
#140974
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
Member
JelleZijlstra
left a comment
JelleZijlstra
left a comment
There was a problem hiding this comment.
Thanks! Could you also add a unit test asserting that if a locals dictionary is passed in, it's not modified?
Lib/annotationlib.py
Outdated
| try: | ||
| globals[cell_name] = cell_value.cell_contents | ||
| if cell_name not in locals: | ||
| locals[cell_name] = cell_value.cell_contents |
Member
There was a problem hiding this comment.
Can you narrow the try-except so it only covers this line? (The part that can raise ValueError is the .cell_contents attribute read.)
Contributor
Author
There was a problem hiding this comment.
Hopefully replacing with setdefault is fine - if the object doesn't have a 'setdefault' attribute, it will raise an AttributeError not ValueError.
Contributor
Author
Added one to test globals and locals, since they're both dicts which are mutable. |
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.
ref.evaluate(format=Format.FORWARDREF)objects #138075, but just adds new locals (without overwriting the actual locals), instead of using a new dictionary.__cell__nonlocal variables added to globals in gh-138151: Fix annotationlib handling of multiple nonlocals #138164globaldeclaration and resets across test runs (this broke buildbots last time).ref.evaluate(format=Format.FORWARDREF)returns a ForwardRef with a copied__globals__that no longer updates #137969