merge 3.2

ecb3bd93 · Benjamin Peterson · a06c029c · 43a976e3 · ecb3bd93
Commit ecb3bd93 authored Jul 29, 2011 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Objects/object.c Objects/object.c +0 -3

No files found.
--- 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");