merge 3.2

benjaminp · benjaminp · commit ecb3bd93ff95 · 2011-07-29T22:44:51.000-05:00
diff --git a/Objects/object.c b/Objects/object.c
@@ -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");
 
