merge 3.2 (closes #13908)
This commit is contained in:
commit
2372bb0722
|
@ -10,6 +10,8 @@ What's New in Python 3.3 Alpha 1?
|
|||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #13908: Ready types returned from PyType_FromSpec.
|
||||
|
||||
- Issue #11235: Fix OverflowError when trying to import a source file whose
|
||||
modification time doesn't fit in a 32-bit timestamp.
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue