Added PyImport_ImportModuleEx(name, globals, locals, fromlist); this

is like PyImport_ImporModule(name) but receives the globals and locals
dict and the fromlist arguments as well.  (The name is a char*; the
others are PyObject*s).

diff --git a/Include/import.h b/Include/import.h
index 10ba69e3e284fa6a46e605090319d77d1a6c4d2d..1e09d4ea3b84967e91834def33db21a012303c77 100644 (file)
--- a/Include/import.h
+++ b/Include/import.h
@@ -42,6 +42,8 @@ PyObject *PyImport_ExecCodeModule Py_PROTO((char *name, PyObject *co));
 PyObject *PyImport_GetModuleDict Py_PROTO((void));
 PyObject *PyImport_AddModule Py_PROTO((char *name));
 PyObject *PyImport_ImportModule Py_PROTO((char *name));
+PyObject *PyImport_ImportModuleEx Py_PROTO((
+       char *name, PyObject *globals, PyObject *locals, PyObject *fromlist));
 PyObject *PyImport_Import Py_PROTO((PyObject *name));
 PyObject *PyImport_ReloadModule Py_PROTO((PyObject *m));
 void PyImport_Cleanup Py_PROTO((void));

diff --git a/PC/python_nt.def b/PC/python_nt.def
index 9fde47b28de5e591053ee82c05e56de9f7e0e04d..0d8ad22bd788574b1859a2ab7dff2b7072155d4f 100644 (file)
--- a/PC/python_nt.def
+++ b/PC/python_nt.def
@@ -211,6 +211,8 @@ EXPORTS
        PyImport_GetModuleDict
        PyImport_GetMagicNumber
        PyImport_ImportModule
+       PyImport_ImportModuleEx
+       PyImport_Import
        PyImport_ImportFrozenModule
        PyImport_ReloadModule
        PyNumber_Coerce