Skip to content

gh-127960 Fix the REPL to set the correct namespace by setting the correct __main__ module #134275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ambv merged 10 commits into from
May 22, 2025
Merged

gh-127960 Fix the REPL to set the correct namespace by setting the correct __main__ module #134275

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8222889
Make _pyrepl not to use the __main__ module as the namespace
whitphx May 19, 2025
6f30f79
Fix Modules/main.c to pass the main module object to the Python-based…
whitphx May 19, 2025
d4ed766
Simplify Lib/_pyrepl/main.py
whitphx May 19, 2025
b681275
Refactoring Modules/main.c
whitphx May 19, 2025
3d76ed8
Fix pymain_run_stdin() in Modules/main.c to call pymain_start_pyrepl(…
whitphx May 19, 2025
2e21fb5
Adapt pyrepl discovery to the new transparent reality
ambv May 21, 2025
e8459d7
Add Blurb
ambv May 21, 2025
7f32756
Add test cases
whitphx May 21, 2025
505e058
Set module_completer to reflect the namespace that the PyREPL actuall…
whitphx May 21, 2025
3ebd1b1
Add and fix the test cases for the module completer
whitphx May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix pymain_run_stdin() in Modules/main.c to call pymain_start_pyrepl(… 
…) instead of pymain_run_module(L"_pyrepl", 0)

This change is an equivalent to the one done in https://github.com/python/cpython/pull/120904/files#diff-79e40dbd94b164b5f42a960224cc7496e33c189b4c66a6810904eda7d703b6f2R600
Two callers of `pymain_start_pyrepl` differs in whether the PYTHONSTARTUP script is already executed or not, so pythonstartup argument is added to `pymain_start_pyrepl` to control whether it should be executed in it or not.
  • Loading branch information
@whitphx
whitphx committed May 19, 2025
commit 3d76ed8c3d0d158d50618b376e4afb2ff7871161
8 changes: 4 additions & 4 deletions Modules/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ pymain_run_command(wchar_t *command)


static int
pymain_start_pyrepl(void)
pymain_start_pyrepl(int pythonstartup)
{
int res = 0;
PyObject *console = NULL;
Expand Down Expand Up @@ -306,7 +306,7 @@ pymain_start_pyrepl(void)
goto done;
}
if (!PyDict_SetItemString(kwargs, "mainmodule", main_module)
&& !PyDict_SetItemString(kwargs, "pythonstartup", _PyLong_GetOne())) {
&& !PyDict_SetItemString(kwargs, "pythonstartup", pythonstartup ? Py_True : Py_False)) {
console_result = PyObject_Call(console, empty_tuple, kwargs);
if (console_result == NULL) {
res = pymain_exit_err_print();
Expand Down Expand Up @@ -570,7 +570,7 @@ pymain_run_stdin(PyConfig *config)
int run = PyRun_AnyFileExFlags(stdin, "<stdin>", 0, &cf);
return (run != 0);
}
return pymain_run_module(L"_pyrepl", 0);
return pymain_start_pyrepl(0);
}


Expand Down Expand Up @@ -603,7 +603,7 @@ pymain_repl(PyConfig *config, int *exitcode)
*exitcode = (run != 0);
return;
}
int run = pymain_start_pyrepl();
int run = pymain_start_pyrepl(1);
*exitcode = (run != 0);
return;
}
Expand Down
Loading