bpo-38858: new_interpreter() uses pycore_init_import_warnings() (GH-1… · python/cpython@2ec1a1b (original) (raw)

`@@ -665,15 +665,17 @@ pycore_init_import_warnings(PyThreadState *tstate, PyObject *sysmod)

`

665

665

`return status;

`

666

666

` }

`

667

667

``

668

``

`-

/* Initialize _warnings. */

`

669

``

`-

if (_PyWarnings_Init() == NULL) {

`

670

``

`-

return _PyStatus_ERR("can't initialize warnings");

`

671

``

`-

}

`

``

668

`+

if (_Py_IsMainInterpreter(tstate)) {

`

``

669

`+

/* Initialize _warnings. */

`

``

670

`+

if (_PyWarnings_Init() == NULL) {

`

``

671

`+

return _PyStatus_ERR("can't initialize warnings");

`

``

672

`+

}

`

672

673

``

673

``

`-

if (config->_install_importlib) {

`

674

``

`-

status = _PyConfig_WritePathConfig(config);

`

675

``

`-

if (_PyStatus_EXCEPTION(status)) {

`

676

``

`-

return status;

`

``

674

`+

if (config->_install_importlib) {

`

``

675

`+

status = _PyConfig_WritePathConfig(config);

`

``

676

`+

if (_PyStatus_EXCEPTION(status)) {

`

``

677

`+

return status;

`

``

678

`+

}

`

677

679

` }

`

678

680

` }

`

679

681

``

`@@ -1575,12 +1577,7 @@ new_interpreter(PyThreadState **tstate_p)

`

1575

1577

` goto done;

`

1576

1578

` }

`

1577

1579

``

1578

``

`-

status = _PyImportHooks_Init(tstate);

`

1579

``

`-

if (_PyStatus_EXCEPTION(status)) {

`

1580

``

`-

goto done;

`

1581

``

`-

}

`

1582

``

-

1583

``

`-

status = init_importlib(tstate, sysmod);

`

``

1580

`+

status = pycore_init_import_warnings(tstate, sysmod);

`

1584

1581

`if (_PyStatus_EXCEPTION(status)) {

`

1585

1582

` goto done;

`

1586

1583

` }

`