gh-135443: Sometimes Fall Back to __main__.__dict__ For Globals #135491
+264
−59
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
neonene
reviewed
Jun 15, 2025
Objects/object.c
Outdated
Comment on lines
2086
to
2090
| if (_PyEval_GetFrame() != NULL) { | ||
| locals = _PyEval_GetFrameLocals(); | ||
| } | ||
| PyThreadState *tstate = _PyThreadState_GET(); | ||
| locals = _PyEval_GetGlobalsFromRunningMain(tstate); |
There was a problem hiding this comment.
_PyEval_GetFrameLocals() returns a new reference (leak), which is overwritten by _PyEval_GetGlobalsFromRunningMain(). Thus the fallback mechanism looks to be missing.
The same goes for builtin_vars().
| @@ -1414,6 +1414,41 @@ def test_call_invalid(self): | |||
| with self.assertRaises(interpreters.NotShareableError): | |||
| interp.call(func, op, 'eggs!') | |||
|
|
|||
| def test_callable_requires_frame(self): | |||
| # There are various functions tha require a current frame. | |||
Comment on lines
1432
to
1436
| notshareable = [ | ||
| globals, | ||
| locals, | ||
| vars, | ||
| ] |
There was a problem hiding this comment.
If "notshareable" here means that the result of the functions cannot be pickled, could NotShareableError differentiate the round-trip in the future? Also, interpreters.is_shareable() returns False for both globals and dir, which might be confusing at first.
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.
For several builtin functions, we now fall back to
__main__.__dict__for the globalswhen there is no current frame and
_PyInterpreterState_IsRunningMain()returnstrue. This allows those functions to be run with
Interpreter.call().The affected builtins:
exec()eval()globals()locals()vars()dir()