traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Call _PyWarnings_InitState() in subinterpreters (GH-21078) 

Py_InitializeFromConfig() now calls also _PyWarnings_InitState() in
subinterpreters.
This commit is contained in:
Victor Stinner 2020-06-23 15:55:45 +02:00 committed by GitHub
parent 61b6492961
commit 30a89338eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Python/pylifecycle.c
View File

@ -685,24 +685,22 @@ pycore_init_import_warnings(PyThreadState *tstate, PyObject *sysmod)
return status; return status;
} }
const PyConfig *config = _PyInterpreterState_GetConfig(tstate->interp); /* Initialize _warnings. */
if (_Py_IsMainInterpreter(tstate)) { status = _PyWarnings_InitState(tstate);
/* Initialize _warnings. */ if (_PyStatus_EXCEPTION(status)) {
status = _PyWarnings_InitState(tstate); return status;
if (_PyStatus_EXCEPTION(status)) { }
return status;
}
if (config->_install_importlib) { const PyConfig *config = _PyInterpreterState_GetConfig(tstate->interp);
if (config->_install_importlib) {
if (_Py_IsMainInterpreter(tstate)) {
status = _PyConfig_WritePathConfig(config); status = _PyConfig_WritePathConfig(config);
if (_PyStatus_EXCEPTION(status)) { if (_PyStatus_EXCEPTION(status)) {
return status; return status;
} }
} }
}
/* This call sets up builtin and frozen import support */ /* This call sets up builtin and frozen import support */
if (config->_install_importlib) {
status = init_importlib(tstate, sysmod); status = init_importlib(tstate, sysmod);
if (_PyStatus_EXCEPTION(status)) { if (_PyStatus_EXCEPTION(status)) {
return status; return status;