merge 3.2

This commit is contained in:
Benjamin Peterson 2011-07-29 22:44:51 -05:00
commit ecb3bd93ff

View file

@ -1472,9 +1472,6 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&PyNone_Type) < 0)
Py_FatalError("Can't initialize None type");
if (PyType_Ready(Py_Ellipsis->ob_type) < 0)
Py_FatalError("Can't initialize type(Ellipsis)");
if (PyType_Ready(&PyNotImplemented_Type) < 0)
Py_FatalError("Can't initialize NotImplemented type");