From 6da3ed63d83375f183fa94cbf7c55acea128e088 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 30 Oct 2012 23:21:10 -0400 Subject: initialize more global type objects (closes #16369) --- Modules/symtablemodule.c | 3 +++ Objects/object.c | 12 ++++++++++++ Objects/unicodeobject.c | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c index 60f9ba9..15c0f92 100644 --- a/Modules/symtablemodule.c +++ b/Modules/symtablemodule.c @@ -52,6 +52,9 @@ init_symtable(void) { PyObject *m; + if (PyType_Ready(&PySTEntry_Type) < 0) + return; + m = Py_InitModule("_symtable", symtable_methods); if (m == NULL) return; diff --git a/Objects/object.c b/Objects/object.c index 9fea13a..e732dce 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -2198,6 +2198,18 @@ _Py_ReadyTypes(void) if (PyType_Ready(&PyFile_Type) < 0) Py_FatalError("Can't initialize file type"); + + if (PyType_Ready(&PyCapsule_Type) < 0) + Py_FatalError("Can't initialize capsule type"); + + if (PyType_Ready(&PyCell_Type) < 0) + Py_FatalError("Can't initialize cell 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"); } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 79b87df..a4c04f4 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8847,6 +8847,12 @@ void _PyUnicode_Init(void) ); PyType_Ready(&EncodingMapType); + + if (PyType_Ready(&PyFieldNameIter_Type) < 0) + Py_FatalError("Can't initialize field name iterator type"); + + if (PyType_Ready(&PyFormatterIter_Type) < 0) + Py_FatalError("Can't initialize formatter iter type"); } /* Finalize the Unicode implementation */ -- cgit v0.12