From cd9536a0872046cc7c151b61b457975e7718274a Mon Sep 17 00:00:00 2001 From: Eric Snow Date: Fri, 25 Apr 2025 14:43:38 -0600 Subject: gh-132781: Cleanup Code Related to NotShareableError (gh-132782) The following are added to the internal C-API: * _PyErr_FormatV() * _PyErr_SetModuleNotFoundError() * _PyXIData_GetNotShareableErrorType() * _PyXIData_FormatNotShareableError() We also drop _PyXIData_lookup_context_t and _PyXIData_GetLookupContext(). --- Modules/_interpreters_common.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'Modules/_interpreters_common.h') diff --git a/Modules/_interpreters_common.h b/Modules/_interpreters_common.h index a6c639feea5..edd65577284 100644 --- a/Modules/_interpreters_common.h +++ b/Modules/_interpreters_common.h @@ -8,24 +8,16 @@ static int ensure_xid_class(PyTypeObject *cls, xidatafunc getdata) { - PyInterpreterState *interp = PyInterpreterState_Get(); - _PyXIData_lookup_context_t ctx; - if (_PyXIData_GetLookupContext(interp, &ctx) < 0) { - return -1; - } - return _PyXIData_RegisterClass(&ctx, cls, getdata); + PyThreadState *tstate = PyThreadState_Get(); + return _PyXIData_RegisterClass(tstate, cls, getdata); } #ifdef REGISTERS_HEAP_TYPES static int clear_xid_class(PyTypeObject *cls) { - PyInterpreterState *interp = PyInterpreterState_Get(); - _PyXIData_lookup_context_t ctx; - if (_PyXIData_GetLookupContext(interp, &ctx) < 0) { - return -1; - } - return _PyXIData_UnregisterClass(&ctx, cls); + PyThreadState *tstate = PyThreadState_Get(); + return _PyXIData_UnregisterClass(tstate, cls); } #endif -- cgit v1.2.3