summaryrefslogtreecommitdiffstats
path: root/Objects/object.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-31 03:31:12 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-10-31 03:31:12 (GMT)
commit7ff2094bc7e2c6ecb735116b2187187bb4f58daa (patch)
treee6323d6ceb223235014f15fc833a243298f1684a /Objects/object.c
parentbfa664c5cf35345a631b7c6ffca83464d71072fe (diff)
parente8ea97fffb591cd71090d0f3114bf1d3bcd31454 (diff)
downloadcpython-7ff2094bc7e2c6ecb735116b2187187bb4f58daa.zip
cpython-7ff2094bc7e2c6ecb735116b2187187bb4f58daa.tar.gz
cpython-7ff2094bc7e2c6ecb735116b2187187bb4f58daa.tar.bz2
merge 3.3 (#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 858eebe..b4bc96d 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1719,6 +1719,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");
}