diff options
Diffstat (limited to 'Python/context.c')
| -rw-r--r-- | Python/context.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Python/context.c b/Python/context.c index a20ec712373..9ed73b7444d 100644 --- a/Python/context.c +++ b/Python/context.c @@ -3,6 +3,7 @@ #include "pycore_context.h" #include "pycore_gc.h" // _PyObject_GC_MAY_BE_TRACKED() #include "pycore_hamt.h" +#include "pycore_initconfig.h" // _PyStatus_OK() #include "pycore_object.h" #include "pycore_pyerrors.h" #include "pycore_pystate.h" // _PyThreadState_GET() @@ -1317,15 +1318,20 @@ _PyContext_Fini(PyInterpreterState *interp) struct _Py_context_state *state = &interp->context; state->numfree = -1; #endif - _PyHamt_Fini(); + _PyHamt_Fini(interp); } -int -_PyContext_Init(void) +PyStatus +_PyContext_InitTypes(PyInterpreterState *interp) { - if (!_PyHamt_Init()) { - return 0; + if (!_Py_IsMainInterpreter(interp)) { + return _PyStatus_OK(); + } + + PyStatus status = _PyHamt_InitTypes(interp); + if (_PyStatus_EXCEPTION(status)) { + return status; } if ((PyType_Ready(&PyContext_Type) < 0) || @@ -1333,7 +1339,7 @@ _PyContext_Init(void) (PyType_Ready(&PyContextToken_Type) < 0) || (PyType_Ready(&PyContextTokenMissing_Type) < 0)) { - return 0; + return _PyStatus_ERR("can't init context types"); } PyObject *missing = get_token_missing(); @@ -1341,9 +1347,9 @@ _PyContext_Init(void) PyContextToken_Type.tp_dict, "MISSING", missing)) { Py_DECREF(missing); - return 0; + return _PyStatus_ERR("can't init context types"); } Py_DECREF(missing); - return 1; + return _PyStatus_OK(); } |