From 42124a727d0516e8b98b4b2d3dbae4044d34a836 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 30 Oct 2012 23:41:54 -0400 Subject: [PATCH] initialize map/filter/zip in _PyBuiltin_Init rather than the catch-all function --- Objects/object.c | 9 --------- Python/bltinmodule.c | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Objects/object.c b/Objects/object.c index b4bc96dc15f..fd1fd256ba7 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1708,15 +1708,6 @@ _Py_ReadyTypes(void) if (PyType_Ready(&PyMemberDescr_Type) < 0) Py_FatalError("Can't initialize member descriptor type"); - if (PyType_Ready(&PyFilter_Type) < 0) - Py_FatalError("Can't initialize filter type"); - - if (PyType_Ready(&PyMap_Type) < 0) - Py_FatalError("Can't initialize map type"); - - if (PyType_Ready(&PyZip_Type) < 0) - Py_FatalError("Can't initialize zip type"); - if (PyType_Ready(&_PyNamespace_Type) < 0) Py_FatalError("Can't initialize namespace type"); diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 0e6e6ff9ff3..fac64bcc69f 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -2405,6 +2405,12 @@ PyObject * _PyBuiltin_Init(void) { PyObject *mod, *dict, *debug; + + if (PyType_Ready(&PyFilter_Type) < 0 || + PyType_Ready(&PyMap_Type) < 0 || + PyType_Ready(&PyZip_Type) < 0) + return NULL; + mod = PyModule_Create(&builtinsmodule); if (mod == NULL) return NULL;