Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge 3.2 (closes #13908)

Browse source
This commit is contained in:
Benjamin Peterson 2012-01-29 20:17:07 -05:00
commit 2372bb0722
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Objects/typeobject.c
View file

@ -2394,7 +2394,8 @@ static short slotoffsets[] = {
#include "typeslots.inc"
};
PyObject* PyType_FromSpec(PyType_Spec *spec)
PyObject *
PyType_FromSpec(PyType_Spec *spec)
{
PyHeapTypeObject *res = (PyHeapTypeObject*)PyType_GenericAlloc(&PyType_Type, 0);
char *res_start = (char*)res;
@ -2434,6 +2435,9 @@ PyObject* PyType_FromSpec(PyType_Spec *spec)
}
}
if (PyType_Ready(&res->ht_type) < 0)
goto fail;
return (PyObject*)res;
fail: