Issue #3080: Add PyImport_ImportModuleLevelObject() function

Use it for the builtin __import__ function.
This commit is contained in:
Victor Stinner 2011-03-14 15:54:52 -04:00
parent 98dbba5d20
commit fe93faf98c
4 changed files with 41 additions and 18 deletions

View file

@ -155,17 +155,14 @@ builtin___import__(PyObject *self, PyObject *args, PyObject *kwds)
{
static char *kwlist[] = {"name", "globals", "locals", "fromlist",
"level", 0};
char *name;
PyObject *globals = NULL;
PyObject *locals = NULL;
PyObject *fromlist = NULL;
PyObject *name, *globals = NULL, *locals = NULL, *fromlist = NULL;
int level = -1;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|OOOi:__import__",
if (!PyArg_ParseTupleAndKeywords(args, kwds, "U|OOOi:__import__",
kwlist, &name, &globals, &locals, &fromlist, &level))
return NULL;
return PyImport_ImportModuleLevel(name, globals, locals,
fromlist, level);
return PyImport_ImportModuleLevelObject(name, globals, locals,
fromlist, level);
}
PyDoc_STRVAR(import_doc,