gh-118908: Use __main__ for the default PyREPL namespace #121054
Merged
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
This allows for PYTHONSTARTUP to execute in the right namespace.
ambv
commented
Jun 26, 2024
| import tokenize | ||
| with tokenize.open(startup_path) as f: | ||
| startup_code = compile(f.read(), startup_path, "exec") | ||
| exec(startup_code, namespace) |
There was a problem hiding this comment.
Note: manual PYTHONSTARTUP also executes in our custom namespace, otherwise it doesn't work. That's why namespace extraction from the optional mainmodule passed happens here already.
ambv
commented
Jun 26, 2024
| # if `__main__` is a cached .pyc file but there's no .py source file | ||
| case4 = f"{pre}, '__cached__', '__doc__', {post}" in output | ||
|
|
||
| self.assertTrue(case1 or case2 or case3 or case4, output) |
There was a problem hiding this comment.
LMK if you know a more elegant solution for "one of these needs to pass".
There was a problem hiding this comment.
I guess this is what I would have done, but I like yours better.
cases = [
f"{pre}, '__doc__', {post}", # if `__main__` is not a file (impossible with pyrepl)
...
]
self.assertTrue(any(case in output for case in cases), output)
lysnikolaou
reviewed
Jun 26, 2024
| # if `__main__` is a cached .pyc file but there's no .py source file | ||
| case4 = f"{pre}, '__cached__', '__doc__', {post}" in output | ||
|
|
||
| self.assertTrue(case1 or case2 or case3 or case4, output) |
There was a problem hiding this comment.
I guess this is what I would have done, but I like yours better.
cases = [
f"{pre}, '__doc__', {post}", # if `__main__` is not a file (impossible with pyrepl)
...
]
self.assertTrue(any(case in output for case in cases), output)|
Thanks @ambv for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jun 26, 2024
…nGH-121054) (cherry picked from commit d611c4c) Co-authored-by: Łukasz Langa <lukasz@langa.pl>
|
GH-121059 is a backport of this pull request to the 3.13 branch. |
|
ambv
pushed a commit
that referenced
this pull request
Jun 26, 2024
|
mrahtz
pushed a commit
to mrahtz/cpython
that referenced
this pull request
Jun 30, 2024
noahbkim
pushed a commit
to hudson-trading/cpython
that referenced
this pull request
Jul 11, 2024
estyxx
pushed a commit
to estyxx/cpython
that referenced
this pull request
Jul 17, 2024
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.
This allows for PYTHONSTARTUP to execute in the same namespace that the interpreter later operates in.
Looks like Eugene was right in his initial implementation of the fix. We can't create a synthetic namespace because then
Modules/main.c:pymain_run_startupis running in a namespace that isn't used later. There's probably more edge cases that using a synthetic namespace created; in Python__main__is clearly expected as the namespace for interaction.Since
-iexposes a different module as__main__, I see no reason why regular REPL execution shouldn't expose__file__pointing at_pyrepl.__main__. Therefore, I adapted the test.