bpo-34008: Allow to call Py_Main() after Py_Initialize() (GH-8043)

bpo-34008: Allow to call Py_Main() after Py_Initialize() (GH-8043) · python/cpython@fb47bca

5 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,14 @@ def test_initialize_twice(self):`
`238`	`238`	`self.assertEqual(out, '')`
`239`	`239`	`self.assertEqual(err, '')`
`240`	`240`
	`241`	`+def test_initialize_pymain(self):`
	`242`	`+"""`
	`243`	`+ bpo-34008: Calling Py_Main() after Py_Initialize() must not fail.`
	`244`	`+ """`
	`245`	`+out, err = self.run_embedded_interpreter("initialize_pymain")`
	`246`	`+self.assertEqual(out.rstrip(), "Py_Main() after Py_Initialize: sys.argv=['-c', 'arg2']")`
	`247`	`+self.assertEqual(err, '')`
	`248`	`+`
`241`	`249`
`242`	`250`	`if __name__ == "__main__":`
`243`	`251`	`unittest.main()`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Py_Main() can again be called after Py_Initialize(), as in Python 3.6.`

Original file line number	Diff line number	Diff line change
`@@ -2696,9 +2696,13 @@ pymain_main(_PyMain *pymain)`
`2696`	`2696`
`2697`	`2697`	`pymain_init_stdio(pymain);`
`2698`	`2698`
`2699`		`-pymain->err = _Py_InitializeCore(&pymain->config);`
`2700`		`-if (_Py_INIT_FAILED(pymain->err)) {`
`2701`		`-_Py_FatalInitError(pymain->err);`
	`2699`	`+/* bpo-34008: For backward compatibility reasons, calling Py_Main() after`
	`2700`	`+ Py_Initialize() ignores the new configuration. */`
	`2701`	`+if (!_PyRuntime.initialized) {`
	`2702`	`+pymain->err = _Py_InitializeCore(&pymain->config);`
	`2703`	`+if (_Py_INIT_FAILED(pymain->err)) {`
	`2704`	`+_Py_FatalInitError(pymain->err);`
	`2705`	`+ }`
`2702`	`2706`	`}`
`2703`	`2707`
`2704`	`2708`	`if (pymain_init_python_main(pymain) < 0) {`

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,21 @@ static int test_initialize_twice(void)`
`276`	`276`	`return 0;`
`277`	`277`	`}`
`278`	`278`
	`279`	`+static int test_initialize_pymain(void)`
	`280`	`+{`
	`281`	`+wchar_t *argv[] = {L"PYTHON", L"-c",`
	`282`	`+L"import sys; print(f'Py_Main() after Py_Initialize: sys.argv={sys.argv}')",`
	`283`	`+L"arg2"};`
	`284`	`+_testembed_Py_Initialize();`
	`285`	`+`
	`286`	`+/* bpo-34008: Calling Py_Main() after Py_Initialize() must not crash */`
	`287`	`+Py_Main(Py_ARRAY_LENGTH(argv), argv);`
	`288`	`+`
	`289`	`+Py_Finalize();`
	`290`	`+`
	`291`	`+return 0;`
	`292`	`+}`
	`293`	`+`
`279`	`294`
`280`	`295`	`/* *********************************************************`
`281`	`296`	`* List of test cases and the function that implements it.`
`@@ -302,6 +317,7 @@ static struct TestCase TestCases[] = {`
`302`	`317`	`{ "pre_initialization_sys_options", test_pre_initialization_sys_options },`
`303`	`318`	`{ "bpo20891", test_bpo20891 },`
`304`	`319`	`{ "initialize_twice", test_initialize_twice },`
	`320`	`+ { "initialize_pymain", test_initialize_pymain },`
`305`	`321`	`{ NULL, NULL }`
`306`	`322`	`};`
`307`	`323`

Original file line number	Diff line number	Diff line change
`@@ -772,6 +772,22 @@ _Py_InitializeCore(const _PyCoreConfig *core_config)`
`772`	`772`	`return _Py_INIT_OK();`
`773`	`773`	`}`
`774`	`774`
	`775`	`+/* Py_Initialize() has already been called: update the main interpreter`
	`776`	`+ configuration. Example of bpo-34008: Py_Main() called after`
	`777`	`+ Py_Initialize(). */`
	`778`	`+static _PyInitError`
	`779`	`+_Py_ReconfigureMainInterpreter(PyInterpreterState *interp,`
	`780`	`+const _PyMainInterpreterConfig *config)`
	`781`	`+{`
	`782`	`+if (config->argv != NULL) {`
	`783`	`+int res = PyDict_SetItemString(interp->sysdict, "argv", config->argv);`
	`784`	`+if (res < 0) {`
	`785`	`+return _Py_INIT_ERR("fail to set sys.argv");`
	`786`	`+ }`
	`787`	`+ }`
	`788`	`+return _Py_INIT_OK();`
	`789`	`+}`
	`790`	`+`
`775`	`791`	`/* Update interpreter state based on supplied configuration settings`
`776`	`792`	`*`
`777`	`793`	`* After calling this function, most of the restrictions on the interpreter`
`@@ -793,9 +809,6 @@ _Py_InitializeMainInterpreter(const _PyMainInterpreterConfig *config)`
`793`	`809`	`if (!_PyRuntime.core_initialized) {`
`794`	`810`	`return _Py_INIT_ERR("runtime core not initialized");`
`795`	`811`	`}`
`796`		`-if (_PyRuntime.initialized) {`
`797`		`-return _Py_INIT_ERR("main interpreter already initialized");`
`798`		`- }`
`799`	`812`
`800`	`813`	`/* Get current thread state and interpreter pointer */`
`801`	`814`	`tstate = PyThreadState_GET();`
`@@ -810,6 +823,10 @@ _Py_InitializeMainInterpreter(const _PyMainInterpreterConfig *config)`
`810`	`823`	`return _Py_INIT_ERR("failed to copy main interpreter config");`
`811`	`824`	`}`
`812`	`825`
	`826`	`+if (_PyRuntime.initialized) {`
	`827`	`+return _Py_ReconfigureMainInterpreter(interp, config);`
	`828`	`+ }`
	`829`	`+`
`813`	`830`	`if (interp->core_config._disable_importlib) {`
`814`	`831`	`/* Special mode for freeze_importlib: run with no import system`
`815`	`832`	`*`