mirror of https://github.com/python/cpython
gh-94673: Fix _PyTypes_InitTypes() and get_type_attr_as_size() (gh-103961)
This change has two small parts: 1. a follow-up to gh-103940 with one case I missed 2. adding a missing return that I noticed while working on related code
This commit is contained in:
parent
d2e2e53f73
commit
424a785a07
|
@ -2102,10 +2102,6 @@ static PyTypeObject* static_types[] = {
|
|||
PyStatus
|
||||
_PyTypes_InitTypes(PyInterpreterState *interp)
|
||||
{
|
||||
if (!_Py_IsMainInterpreter(interp)) {
|
||||
return _PyStatus_OK();
|
||||
}
|
||||
|
||||
// All other static types (unless initialized elsewhere)
|
||||
for (size_t i=0; i < Py_ARRAY_LENGTH(static_types); i++) {
|
||||
PyTypeObject *type = static_types[i];
|
||||
|
|
|
@ -31,6 +31,7 @@ get_type_attr_as_size(PyTypeObject *tp, PyObject *name)
|
|||
PyErr_Format(PyExc_TypeError,
|
||||
"Missed attribute '%U' of type %s",
|
||||
name, tp->tp_name);
|
||||
return -1;
|
||||
}
|
||||
return PyLong_AsSsize_t(v);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue