mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

initialize map/filter/zip in _PyBuiltin_Init rather than the catch-all function

Browse source
This commit is contained in:
Benjamin Peterson 2012-10-30 23:41:54 -04:00
parent 7ff2094bc7
commit 42124a727d
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Objects/object.c
View file

@ -1708,15 +1708,6 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&PyMemberDescr_Type) < 0) if (PyType_Ready(&PyMemberDescr_Type) < 0)
Py_FatalError("Can't initialize member descriptor type"); 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) if (PyType_Ready(&_PyNamespace_Type) < 0)
Py_FatalError("Can't initialize namespace type"); Py_FatalError("Can't initialize namespace type");

6
Python/bltinmodule.c
View file

@ -2405,6 +2405,12 @@ PyObject *
_PyBuiltin_Init(void) _PyBuiltin_Init(void)
{ {
PyObject *mod, *dict, *debug; 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); mod = PyModule_Create(&builtinsmodule);
if (mod == NULL) if (mod == NULL)
return NULL; return NULL;