summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Objects/object.c9
-rw-r--r--Python/bltinmodule.c6
2 files changed, 6 insertions, 9 deletions
diff --git a/Objects/object.c b/Objects/object.c
index b4bc96d..fd1fd25 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 0e6e6ff..fac64bc 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;