mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 11:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

2
Misc/NEWS
View file

@ -10,6 +10,8 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #13908: Ready types returned from PyType_FromSpec.
- Issue #11235: Fix OverflowError when trying to import a source file whose - Issue #11235: Fix OverflowError when trying to import a source file whose
modification time doesn't fit in a 32-bit timestamp. modification time doesn't fit in a 32-bit timestamp.

6
Objects/typeobject.c
View file

@ -2394,7 +2394,8 @@ static short slotoffsets[] = {
#include "typeslots.inc" #include "typeslots.inc"
}; };
PyObject* PyType_FromSpec(PyType_Spec *spec) PyObject *
PyType_FromSpec(PyType_Spec *spec)
{ {
PyHeapTypeObject *res = (PyHeapTypeObject*)PyType_GenericAlloc(&PyType_Type, 0); PyHeapTypeObject *res = (PyHeapTypeObject*)PyType_GenericAlloc(&PyType_Type, 0);
char *res_start = (char*)res; 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; return (PyObject*)res;
fail: fail: