summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-07-30 03:44:51 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-07-30 03:44:51 (GMT)
commitecb3bd93ff9508a4ec0b705b3778b04a0590e5e7 (patch)
tree66e7a94f81e87946c5267fb9ec30f6c0ef92d2ed
parenta06c029ce9c0d395dc27773403213bf0becbac3b (diff)
parent43a976e3d9575233a7953b928f324d5f136ccfbf (diff)
downloadcpython-ecb3bd93ff9508a4ec0b705b3778b04a0590e5e7.zip
cpython-ecb3bd93ff9508a4ec0b705b3778b04a0590e5e7.tar.gz
cpython-ecb3bd93ff9508a4ec0b705b3778b04a0590e5e7.tar.bz2
merge 3.2
-rw-r--r--Objects/object.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/Objects/object.c b/Objects/object.c
index cf10f3c..6af426f 100644
--- 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");