Skip to content

Commit

Permalink
gh-94673: Fix _PyTypes_InitTypes() and get_type_attr_as_size() (gh-10…
Browse files Browse the repository at this point in the history
…3961)

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
  • Loading branch information
ericsnowcurrently committed Apr 28, 2023
1 parent d2e2e53 commit 424a785
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 0 additions & 4 deletions Objects/object.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
1 change: 1 addition & 0 deletions Objects/structseq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 424a785

Please sign in to comment.