Skip to content

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

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
vstinner merged 3 commits into from
Jul 20, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c0c048
bpo-34008: Allow to call Py_Main() after Py_Initialize()
vstinner Jul 2, 2018
2834539
Remove FIXME comment
vstinner Jul 20, 2018
b874c85
Fix indent
vstinner Jul 20, 2018
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
8 changes: 8 additions & 0 deletions Lib/test/test_embed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,14 @@ def test_initialize_twice(self):
self.assertEqual(out, '')
self.assertEqual(err, '')

def test_initialize_pymain(self):
"""
bpo-34008: Calling Py_Main() after Py_Initialize() must not fail.
"""
out, err = self.run_embedded_interpreter("initialize_pymain")
self.assertEqual(out.rstrip(), "Py_Main() after Py_Initialize: sys.argv=['-c', 'arg2']")
self.assertEqual(err, '')


if __name__ == "__main__":
unittest.main()
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/C API/2018-07-02-10-58-11.bpo-34008.COewz-.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Py_Main() can again be called after Py_Initialize(), as in Python 3.6.
10 changes: 7 additions & 3 deletions Modules/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2696,9 +2696,13 @@ pymain_main(_PyMain *pymain)

pymain_init_stdio(pymain);

pymain->err = _Py_InitializeCore(&pymain->config);
if (_Py_INIT_FAILED(pymain->err)) {
_Py_FatalInitError(pymain->err);
/* bpo-34008: For backward compatibility reasons, calling Py_Main() after
Py_Initialize() ignores the new configuration. */
if (!_PyRuntime.initialized) {
pymain->err = _Py_InitializeCore(&pymain->config);
if (_Py_INIT_FAILED(pymain->err)) {
_Py_FatalInitError(pymain->err);
}
}

if (pymain_init_python_main(pymain) < 0) {
Expand Down
16 changes: 16 additions & 0 deletions Programs/_testembed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,21 @@ static int test_initialize_twice(void)
return 0;
}

static int test_initialize_pymain(void)
{
wchar_t *argv[] = {L"PYTHON", L"-c",
L"import sys; print(f'Py_Main() after Py_Initialize: sys.argv={sys.argv}')",
L"arg2"};
_testembed_Py_Initialize();

/* bpo-34008: Calling Py_Main() after Py_Initialize() must not crash */
Py_Main(Py_ARRAY_LENGTH(argv), argv);

Py_Finalize();

return 0;
}


/* *********************************************************
* List of test cases and the function that implements it.
Expand All @@ -302,6 +317,7 @@ static struct TestCase TestCases[] = {
{ "pre_initialization_sys_options", test_pre_initialization_sys_options },
{ "bpo20891", test_bpo20891 },
{ "initialize_twice", test_initialize_twice },
{ "initialize_pymain", test_initialize_pymain },
{ NULL, NULL }
};

Expand Down
23 changes: 20 additions & 3 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,22 @@ _Py_InitializeCore(const _PyCoreConfig *core_config)
return _Py_INIT_OK();
}

/* Py_Initialize() has already been called: update the main interpreter
configuration. Example of bpo-34008: Py_Main() called after
Py_Initialize(). */
static _PyInitError
_Py_ReconfigureMainInterpreter(PyInterpreterState *interp,
const _PyMainInterpreterConfig *config)
{
if (config->argv != NULL) {
int res = PyDict_SetItemString(interp->sysdict, "argv", config->argv);
if (res < 0) {
return _Py_INIT_ERR("fail to set sys.argv");
}
}
return _Py_INIT_OK();
}

/* Update interpreter state based on supplied configuration settings
*
* After calling this function, most of the restrictions on the interpreter
Expand All @@ -793,9 +809,6 @@ _Py_InitializeMainInterpreter(const _PyMainInterpreterConfig *config)
if (!_PyRuntime.core_initialized) {
return _Py_INIT_ERR("runtime core not initialized");
}
if (_PyRuntime.initialized) {
return _Py_INIT_ERR("main interpreter already initialized");
}

/* Get current thread state and interpreter pointer */
tstate = PyThreadState_GET();
Expand All @@ -810,6 +823,10 @@ _Py_InitializeMainInterpreter(const _PyMainInterpreterConfig *config)
return _Py_INIT_ERR("failed to copy main interpreter config");
}

if (_PyRuntime.initialized) {
return _Py_ReconfigureMainInterpreter(interp, config);
}

if (interp->core_config._disable_importlib) {
/* Special mode for freeze_importlib: run with no import system
*
Expand Down