From ecca9993d71841bcea26988c7aafbeb5d504d7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Wed, 11 Jun 2008 05:26:20 +0000 Subject: Implement PEP 3121: new module initialization and finalization API. --- Python/pythonrun.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Python/pythonrun.c') diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 24517e4764..3df5793e5f 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -193,6 +193,7 @@ Py_InitializeEx(int install_sigs) bimod = _PyBuiltin_Init(); if (bimod == NULL) Py_FatalError("Py_Initialize: can't initialize builtins modules"); + _PyImport_FixupExtension(bimod, "builtins", "builtins"); interp->builtins = PyModule_GetDict(bimod); if (interp->builtins == NULL) Py_FatalError("Py_Initialize: can't initialize builtins dict"); @@ -208,7 +209,7 @@ Py_InitializeEx(int install_sigs) if (interp->sysdict == NULL) Py_FatalError("Py_Initialize: can't initialize sys dict"); Py_INCREF(interp->sysdict); - _PyImport_FixupExtension("sys", "sys"); + _PyImport_FixupExtension(sysmod, "sys", "sys"); PySys_SetPath(Py_GetPath()); PyDict_SetItemString(interp->sysdict, "modules", interp->modules); @@ -223,9 +224,6 @@ Py_InitializeEx(int install_sigs) _PyImport_Init(); - /* phase 2 of builtins */ - _PyImport_FixupExtension("builtins", "builtins"); - _PyImportHooks_Init(); if (install_sigs) -- cgit v1.2.1