Skip to content

Commit 30a8933

Browse files
authored
Call _PyWarnings_InitState() in subinterpreters (GH-21078)
Py_InitializeFromConfig() now calls also _PyWarnings_InitState() in subinterpreters.
1 parent 61b6492 commit 30a8933

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

Python/pylifecycle.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -685,24 +685,22 @@ pycore_init_import_warnings(PyThreadState *tstate, PyObject *sysmod)
685685
return status;
686686
}
687687

688-
const PyConfig *config = _PyInterpreterState_GetConfig(tstate->interp);
689-
if (_Py_IsMainInterpreter(tstate)) {
690-
/* Initialize _warnings. */
691-
status = _PyWarnings_InitState(tstate);
692-
if (_PyStatus_EXCEPTION(status)) {
693-
return status;
694-
}
688+
/* Initialize _warnings. */
689+
status = _PyWarnings_InitState(tstate);
690+
if (_PyStatus_EXCEPTION(status)) {
691+
return status;
692+
}
695693

696-
if (config->_install_importlib) {
694+
const PyConfig *config = _PyInterpreterState_GetConfig(tstate->interp);
695+
if (config->_install_importlib) {
696+
if (_Py_IsMainInterpreter(tstate)) {
697697
status = _PyConfig_WritePathConfig(config);
698698
if (_PyStatus_EXCEPTION(status)) {
699699
return status;
700700
}
701701
}
702-
}
703702

704-
/* This call sets up builtin and frozen import support */
705-
if (config->_install_importlib) {
703+
/* This call sets up builtin and frozen import support */
706704
status = init_importlib(tstate, sysmod);
707705
if (_PyStatus_EXCEPTION(status)) {
708706
return status;

0 commit comments

Comments
 (0)