summaryrefslogtreecommitdiffstats
path: root/Objects/object.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-31 03:27:52 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-10-31 03:27:52 (GMT)
commite8ea97fffb591cd71090d0f3114bf1d3bcd31454 (patch)
tree3710073dcda7cfa947f97676c4edd305bb38952f /Objects/object.c
parentcc4bacf2070f83479abb54592c35c7d2c6508000 (diff)
parentc43112823b1f748822c43ad42566537580c02af2 (diff)
downloadcpython-e8ea97fffb591cd71090d0f3114bf1d3bcd31454.zip
cpython-e8ea97fffb591cd71090d0f3114bf1d3bcd31454.tar.gz
cpython-e8ea97fffb591cd71090d0f3114bf1d3bcd31454.tar.bz2
merge 3.2 (#16369)
Diffstat (limited to 'Objects/object.c')
-rw-r--r--Objects/object.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/Objects/object.c b/Objects/object.c
index f417184..949e7dc 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1710,6 +1710,30 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&_PyNamespace_Type) < 0)
Py_FatalError("Can't initialize namespace type");
+
+ if (PyType_Ready(&PyCapsule_Type) < 0)
+ Py_FatalError("Can't initialize capsule type");
+
+ if (PyType_Ready(&PyLongRangeIter_Type) < 0)
+ Py_FatalError("Can't initialize long range iterator type");
+
+ if (PyType_Ready(&PyCell_Type) < 0)
+ Py_FatalError("Can't initialize cell type");
+
+ if (PyType_Ready(&PyInstanceMethod_Type) < 0)
+ Py_FatalError("Can't initialize instance method type");
+
+ if (PyType_Ready(&PyClassMethodDescr_Type) < 0)
+ Py_FatalError("Can't initialize class method descr type");
+
+ if (PyType_Ready(&PyMethodDescr_Type) < 0)
+ Py_FatalError("Can't initialize method descr type");
+
+ if (PyType_Ready(&PyCallIter_Type) < 0)
+ Py_FatalError("Can't initialize call iter type");
+
+ if (PyType_Ready(&PySeqIter_Type) < 0)
+ Py_FatalError("Can't initialize sequence iterator type");
}