mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the builtin module initialization code to store the init function for future reinitialization.

This commit is contained in:
Antoine Pitrou 2012-01-18 20:16:09 +01:00
parent 0c60381749
commit 6c40eb7f42
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ What's New in Python 3.2.3?
Core and Builtins Core and Builtins
----------------- -----------------
- Fix the builtin module initialization code to store the init function for
future reinitialization.
- Issue #13629: Renumber the tokens in token.h so that they match the indexes - Issue #13629: Renumber the tokens in token.h so that they match the indexes
into _PyParser_TokenNames. into _PyParser_TokenNames.

4
Python/import.c
View File

@ -2169,6 +2169,7 @@ init_builtin(char *name)
for (p = PyImport_Inittab; p->name != NULL; p++) { for (p = PyImport_Inittab; p->name != NULL; p++) {
PyObject *mod; PyObject *mod;
PyModuleDef *def;
if (strcmp(name, p->name) == 0) { if (strcmp(name, p->name) == 0) {
if (p->initfunc == NULL) { if (p->initfunc == NULL) {
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
@ -2181,6 +2182,9 @@ init_builtin(char *name)
mod = (*p->initfunc)(); mod = (*p->initfunc)();
if (mod == 0) if (mod == 0)
return -1; return -1;
/* Remember pointer to module init function. */
def = PyModule_GetDef(mod);
def->m_base.m_init = p->initfunc;
if (_PyImport_FixupBuiltin(mod, name) < 0) if (_PyImport_FixupBuiltin(mod, name) < 0)
return -1; return -1;
/* FixupExtension has put the module into sys.modules, /* FixupExtension has put the module into sys.modules,