diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2021-12-09 12:59:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 12:59:26 -0700 |
| commit | c8749b578324ad4089c8d014d9136bc42b065343 (patch) | |
| tree | 8b74af3da8568651c2c2068d9fe544617d70554f /Python/errors.c | |
| parent | d8a464ef0380692975d73a3a1513d901b6af8e65 (diff) | |
| download | cpython3-c8749b578324ad4089c8d014d9136bc42b065343.tar.gz | |
bpo-46008: Make runtime-global object/type lifecycle functions and state consistent. (gh-29998)
This change is strictly renames and moving code around. It helps in the following ways:
* ensures type-related init functions focus strictly on one of the three aspects (state, objects, types)
* passes in PyInterpreterState * to all those functions, simplifying work on moving types/objects/state to the interpreter
* consistent naming conventions help make what's going on more clear
* keeping API related to a type in the corresponding header file makes it more obvious where to look for it
https://bugs.python.org/issue46008
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Python/errors.c b/Python/errors.c index 44d2773acd..5be15e54db 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -1241,8 +1241,12 @@ static PyStructSequence_Desc UnraisableHookArgs_desc = { PyStatus -_PyErr_InitTypes(void) +_PyErr_InitTypes(PyInterpreterState *interp) { + if (!_Py_IsMainInterpreter(interp)) { + return _PyStatus_OK(); + } + if (UnraisableHookArgsType.tp_name == NULL) { if (PyStructSequence_InitType2(&UnraisableHookArgsType, &UnraisableHookArgs_desc) < 0) { |