[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

benjamin.peterson python-checkins at python.org
Sat Jul 30 05:45:01 CEST 2011


http://hg.python.org/cpython/rev/dc898f2a04ca
changeset:   71623:dc898f2a04ca
parent:      71621:aef120ac65b6
parent:      71622:44ff619b5957
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Jul 29 22:44:51 2011 -0500
summary:
  merge 3.2

files:
  Objects/object.c |  3 ---
  1 files changed, 0 insertions(+), 3 deletions(-)


diff --git a/Objects/object.c b/Objects/object.c
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1472,9 +1472,6 @@
     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");
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list