merge 3.2

This commit is contained in:
Benjamin Peterson 2011-09-01 16:33:56 -04:00
commit e35dc5110f
3 changed files with 7 additions and 6 deletions

View file

@ -1558,6 +1558,9 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&PyWrapperDescr_Type) < 0)
Py_FatalError("Can't initialize wrapper type");
if (PyType_Ready(&_PyMethodWrapper_Type) < 0)
Py_FatalError("Can't initialize method wrapper type");
if (PyType_Ready(&PyEllipsis_Type) < 0)
Py_FatalError("Can't initialize ellipsis type");