gh-135443: Sometimes Fall Back to __main__.__dict__ For Globals#135491
Merged
ericsnowcurrently merged 11 commits intoJun 16, 2025
Conversation
neonene
reviewed
Jun 15, 2025
Comment on lines
+2086
to
+2090
| if (_PyEval_GetFrame() != NULL) { | ||
| locals = _PyEval_GetFrameLocals(); | ||
| } | ||
| PyThreadState *tstate = _PyThreadState_GET(); | ||
| locals = _PyEval_GetGlobalsFromRunningMain(tstate); |
Contributor
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().
| 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, | ||
| ] |
Contributor
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.
|
🤖 New build scheduled with the buildbot fleet by @ericsnowcurrently for commit c93f890 🤖 Results will be shown at: https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F135491%2Fmerge If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again. |
|
Thanks @ericsnowcurrently for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jun 16, 2025
…pythongh-135491) For several builtin functions, we now fall back to __main__.__dict__ for the globals when there is no current frame and _PyInterpreterState_IsRunningMain() returns true. This allows those functions to be run with Interpreter.call(). The affected builtins: * exec() * eval() * globals() * locals() * vars() * dir() We take a similar approach with "stateless" functions, which don't use any global variables. (cherry picked from commit a450a0d) Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
|
GH-135593 is a backport of this pull request to the 3.14 branch. |
ericsnowcurrently
added a commit
that referenced
this pull request
Jun 16, 2025
gh-135593) For several builtin functions, we now fall back to __main__.__dict__ for the globals when there is no current frame and _PyInterpreterState_IsRunningMain() returns true. This allows those functions to be run with Interpreter.call(). The affected builtins: * exec() * eval() * globals() * locals() * vars() * dir() We take a similar approach with "stateless" functions, which don't use any global variables. (cherry picked from commit a450a0d, AKA gh-135491) Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
lkollar
pushed a commit
to lkollar/cpython
that referenced
this pull request
Jun 19, 2025
…pythongh-135491) For several builtin functions, we now fall back to __main__.__dict__ for the globals when there is no current frame and _PyInterpreterState_IsRunningMain() returns true. This allows those functions to be run with Interpreter.call(). The affected builtins: * exec() * eval() * globals() * locals() * vars() * dir() We take a similar approach with "stateless" functions, which don't use any global variables.
Pranjal095
pushed a commit
to Pranjal095/cpython
that referenced
this pull request
Jul 12, 2025
…pythongh-135491) For several builtin functions, we now fall back to __main__.__dict__ for the globals when there is no current frame and _PyInterpreterState_IsRunningMain() returns true. This allows those functions to be run with Interpreter.call(). The affected builtins: * exec() * eval() * globals() * locals() * vars() * dir() We take a similar approach with "stateless" functions, which don't use any global variables.
taegyunkim
pushed a commit
to taegyunkim/cpython
that referenced
this pull request
Aug 4, 2025
…pythongh-135491) For several builtin functions, we now fall back to __main__.__dict__ for the globals when there is no current frame and _PyInterpreterState_IsRunningMain() returns true. This allows those functions to be run with Interpreter.call(). The affected builtins: * exec() * eval() * globals() * locals() * vars() * dir() We take a similar approach with "stateless" functions, which don't use any global variables.
Agent-Hellboy
pushed a commit
to Agent-Hellboy/cpython
that referenced
this pull request
Aug 19, 2025
…pythongh-135491) For several builtin functions, we now fall back to __main__.__dict__ for the globals when there is no current frame and _PyInterpreterState_IsRunningMain() returns true. This allows those functions to be run with Interpreter.call(). The affected builtins: * exec() * eval() * globals() * locals() * vars() * dir() We take a similar approach with "stateless" functions, which don't use any global variables.
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
3 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.
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()