From 500c146387b01ea797b52e6a54caf228384e184c Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 22 Jan 2022 18:55:48 +0100 Subject: bpo-46417: Clear more static types (GH-30796) * Move PyContext static types into object.c static_types list. * Rename PyContextTokenMissing_Type to _PyContextTokenMissing_Type and declare it in pycore_context.h. * _PyHamtItems types are no long exported: replace PyAPI_DATA() with extern. --- Python/context.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'Python/context.c') diff --git a/Python/context.c b/Python/context.c index 9ed73b7444d..f3033d9b649 100644 --- a/Python/context.c +++ b/Python/context.c @@ -1260,7 +1260,7 @@ context_token_missing_tp_repr(PyObject *self) } -PyTypeObject PyContextTokenMissing_Type = { +PyTypeObject _PyContextTokenMissing_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) "Token.MISSING", sizeof(PyContextTokenMissing), @@ -1279,7 +1279,7 @@ get_token_missing(void) } _token_missing = (PyObject *)PyObject_New( - PyContextTokenMissing, &PyContextTokenMissing_Type); + PyContextTokenMissing, &_PyContextTokenMissing_Type); if (_token_missing == NULL) { return NULL; } @@ -1323,25 +1323,12 @@ _PyContext_Fini(PyInterpreterState *interp) PyStatus -_PyContext_InitTypes(PyInterpreterState *interp) +_PyContext_Init(PyInterpreterState *interp) { if (!_Py_IsMainInterpreter(interp)) { return _PyStatus_OK(); } - PyStatus status = _PyHamt_InitTypes(interp); - if (_PyStatus_EXCEPTION(status)) { - return status; - } - - if ((PyType_Ready(&PyContext_Type) < 0) || - (PyType_Ready(&PyContextVar_Type) < 0) || - (PyType_Ready(&PyContextToken_Type) < 0) || - (PyType_Ready(&PyContextTokenMissing_Type) < 0)) - { - return _PyStatus_ERR("can't init context types"); - } - PyObject *missing = get_token_missing(); if (PyDict_SetItemString( PyContextToken_Type.tp_dict, "MISSING", missing)) -- cgit v1.2.3