Commit3d76ed8

committed

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 inhttps://github.com/python/cpython/pull/120904/files#diff-79e40dbd94b164b5f42a960224cc7496e33c189b4c66a6810904eda7d703b6f2R600Two 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.

1 parentb681275 commit3d76ed8Copy full SHA for 3d76ed8

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ pymain_run_command(wchar_t *command)`
`269`	`269`
`270`	`270`
`271`	`271`	`staticint`
`272`		`-pymain_start_pyrepl(void)`
	`272`	`+pymain_start_pyrepl(intpythonstartup)`
`273`	`273`	`{`
`274`	`274`	`intres=0;`
`275`	`275`	`PyObject*console=NULL;`
`@@ -306,7 +306,7 @@ pymain_start_pyrepl(void)`
`306`	`306`	`gotodone;`
`307`	`307`	`}`
`308`	`308`	`if (!PyDict_SetItemString(kwargs,"mainmodule",main_module)`
`309`		`-&& !PyDict_SetItemString(kwargs,"pythonstartup",_PyLong_GetOne())) {`
	`309`	`+&& !PyDict_SetItemString(kwargs,"pythonstartup",pythonstartup ?Py_True :Py_False)) {`
`310`	`310`	`console_result=PyObject_Call(console,empty_tuple,kwargs);`
`311`	`311`	`if (console_result==NULL) {`
`312`	`312`	`res=pymain_exit_err_print();`
`@@ -570,7 +570,7 @@ pymain_run_stdin(PyConfig *config)`
`570`	`570`	`intrun=PyRun_AnyFileExFlags(stdin,"<stdin>",0,&cf);`
`571`	`571`	`return (run!=0);`
`572`	`572`	`}`
`573`		`-returnpymain_run_module(L"_pyrepl",0);`
	`573`	`+returnpymain_start_pyrepl(0);`
`574`	`574`	`}`
`575`	`575`
`576`	`576`
`@@ -603,7 +603,7 @@ pymain_repl(PyConfig config, int exitcode)`
`603`	`603`	`*exitcode= (run!=0);`
`604`	`604`	`return;`
`605`	`605`	`}`
`606`		`-intrun=pymain_start_pyrepl();`
	`606`	`+intrun=pymain_start_pyrepl(1);`
`607`	`607`	`*exitcode= (run!=0);`
`608`	`608`	`return;`
`609`	`609`	`}`

Comments

(0)