1991-02-19 12:39:46 +00:00
|
|
|
/***********************************************************
|
1995-01-04 19:12:13 +00:00
|
|
|
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
|
|
|
|
The Netherlands.
|
1991-02-19 12:39:46 +00:00
|
|
|
|
|
|
|
All Rights Reserved
|
|
|
|
|
1996-10-25 14:44:06 +00:00
|
|
|
Permission to use, copy, modify, and distribute this software and its
|
|
|
|
documentation for any purpose and without fee is hereby granted,
|
1991-02-19 12:39:46 +00:00
|
|
|
provided that the above copyright notice appear in all copies and that
|
1996-10-25 14:44:06 +00:00
|
|
|
both that copyright notice and this permission notice appear in
|
1991-02-19 12:39:46 +00:00
|
|
|
supporting documentation, and that the names of Stichting Mathematisch
|
1996-10-25 14:44:06 +00:00
|
|
|
Centrum or CWI or Corporation for National Research Initiatives or
|
|
|
|
CNRI not be used in advertising or publicity pertaining to
|
|
|
|
distribution of the software without specific, written prior
|
|
|
|
permission.
|
|
|
|
|
|
|
|
While CWI is the initial source for this software, a modified version
|
|
|
|
is made available by the Corporation for National Research Initiatives
|
|
|
|
(CNRI) at the Internet address ftp://ftp.python.org.
|
|
|
|
|
|
|
|
STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
|
|
|
|
REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
|
|
|
|
MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
|
|
|
|
CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
|
|
|
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
|
|
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
|
|
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
|
|
PERFORMANCE OF THIS SOFTWARE.
|
1991-02-19 12:39:46 +00:00
|
|
|
|
|
|
|
******************************************************************/
|
|
|
|
|
1990-10-14 12:07:46 +00:00
|
|
|
/* Module definition and import implementation */
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
#include "Python.h"
|
1990-10-14 12:07:46 +00:00
|
|
|
|
|
|
|
#include "node.h"
|
|
|
|
#include "token.h"
|
|
|
|
#include "errcode.h"
|
1991-06-04 19:39:42 +00:00
|
|
|
#include "marshal.h"
|
|
|
|
#include "compile.h"
|
1992-08-05 19:58:53 +00:00
|
|
|
#include "eval.h"
|
1992-02-26 15:19:13 +00:00
|
|
|
#include "osdefs.h"
|
1995-01-02 19:04:15 +00:00
|
|
|
#include "importdl.h"
|
1995-02-15 22:57:06 +00:00
|
|
|
#ifdef macintosh
|
|
|
|
#include "macglue.h"
|
|
|
|
#endif
|
1991-06-04 19:39:42 +00:00
|
|
|
|
1996-12-05 23:27:02 +00:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
/* We expect that stat exists on most systems.
|
|
|
|
It's confirmed on Unix, Mac and Windows.
|
|
|
|
If you don't have it, add #define DONT_HAVE_STAT to your config.h. */
|
|
|
|
#ifndef DONT_HAVE_STAT
|
|
|
|
#define HAVE_STAT
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
|
|
|
#ifndef S_ISDIR
|
|
|
|
#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
extern long PyOS_GetLastModificationTime(); /* In getmtime.c */
|
1993-10-15 13:01:11 +00:00
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Magic word to reject .pyc files generated by other Python versions */
|
1995-07-07 22:50:36 +00:00
|
|
|
/* Change for each incompatible change */
|
|
|
|
/* The value of CR and LF is incorporated so if you ever read or write
|
|
|
|
a .pyc file in text mode the magic number will be wrong; also, the
|
|
|
|
Apple MPW compiler swaps their values, botching string constants */
|
|
|
|
/* XXX Perhaps the magic number should be frozen and a version field
|
|
|
|
added to the .pyc file header? */
|
1997-01-17 21:06:11 +00:00
|
|
|
/* New way to come up with the magic number: (YEAR-1995), MONTH, DAY */
|
1997-01-24 03:44:53 +00:00
|
|
|
#define MAGIC (20121 | ((long)'\r'<<16) | ((long)'\n'<<24))
|
1992-01-19 16:28:21 +00:00
|
|
|
|
1997-08-02 03:10:38 +00:00
|
|
|
/* See _PyImport_FixupExtension() below */
|
|
|
|
static PyObject *extensions = NULL;
|
1994-08-29 12:54:38 +00:00
|
|
|
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Initialize things */
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
void
|
1997-08-02 03:10:38 +00:00
|
|
|
_PyImport_Init()
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
1997-03-11 18:37:35 +00:00
|
|
|
if (Py_OptimizeFlag) {
|
|
|
|
/* Replace ".pyc" with ".pyo" in import_filetab */
|
|
|
|
struct filedescr *p;
|
1997-04-29 20:08:16 +00:00
|
|
|
for (p = _PyImport_Filetab; p->suffix != NULL; p++) {
|
1997-03-11 18:37:35 +00:00
|
|
|
if (strcmp(p->suffix, ".pyc") == 0)
|
|
|
|
p->suffix = ".pyo";
|
|
|
|
}
|
|
|
|
}
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1997-08-02 03:10:38 +00:00
|
|
|
void
|
|
|
|
_PyImport_Fini()
|
|
|
|
{
|
|
|
|
Py_XDECREF(extensions);
|
|
|
|
extensions = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper for sys */
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyImport_GetModuleDict()
|
|
|
|
{
|
|
|
|
PyInterpreterState *interp = PyThreadState_Get()->interp;
|
|
|
|
if (interp->modules == NULL)
|
|
|
|
Py_FatalError("PyImport_GetModuleDict: no module dictionary!");
|
|
|
|
return interp->modules;
|
|
|
|
}
|
|
|
|
|
1991-12-16 13:06:34 +00:00
|
|
|
|
1997-08-05 02:20:51 +00:00
|
|
|
/* Helper for PyImport_Cleanup */
|
|
|
|
|
|
|
|
static void
|
|
|
|
clear_carefully(d)
|
|
|
|
PyObject *d;
|
|
|
|
{
|
|
|
|
/* To make the execution order of destructors for global
|
|
|
|
objects a bit more predictable, we first zap all objects
|
|
|
|
whose name starts with a single underscore, before we clear
|
|
|
|
the entire dictionary. We zap them by replacing them with
|
|
|
|
None, rather than deleting them from the dictionary, to
|
|
|
|
avoid rehashing the dictionary (to some extent). */
|
|
|
|
|
|
|
|
int pos;
|
|
|
|
PyObject *key, *value;
|
|
|
|
|
|
|
|
pos = 0;
|
|
|
|
while (PyDict_Next(d, &pos, &key, &value)) {
|
|
|
|
if (value != Py_None && PyString_Check(key)) {
|
|
|
|
char *s = PyString_AsString(key);
|
|
|
|
if (s[0] == '_' && s[1] != '_')
|
|
|
|
PyDict_SetItem(d, key, Py_None);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDict_Clear(d);
|
|
|
|
}
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Un-initialize things, as good as we can */
|
1991-12-16 13:06:34 +00:00
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
void
|
1997-04-29 20:08:16 +00:00
|
|
|
PyImport_Cleanup()
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
1997-08-02 03:10:38 +00:00
|
|
|
PyInterpreterState *interp = PyThreadState_Get()->interp;
|
|
|
|
PyObject *tmp = interp->modules;
|
|
|
|
if (tmp != NULL) {
|
|
|
|
int pos;
|
|
|
|
PyObject *key, *value;
|
|
|
|
interp->modules = NULL;
|
|
|
|
pos = 0;
|
|
|
|
while (PyDict_Next(tmp, &pos, &key, &value)) {
|
|
|
|
if (PyModule_Check(value)) {
|
|
|
|
PyObject *d = PyModule_GetDict(value);
|
1997-08-05 02:20:51 +00:00
|
|
|
clear_carefully(d);
|
1997-08-02 03:10:38 +00:00
|
|
|
}
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
PyDict_Clear(tmp);
|
|
|
|
Py_DECREF(tmp);
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
|
|
|
}
|
1990-12-20 15:06:42 +00:00
|
|
|
|
1991-04-03 19:03:52 +00:00
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Helper for pythonrun.c -- return magic number */
|
1994-09-14 13:31:04 +00:00
|
|
|
|
|
|
|
long
|
1997-04-29 20:08:16 +00:00
|
|
|
PyImport_GetMagicNumber()
|
1994-09-14 13:31:04 +00:00
|
|
|
{
|
|
|
|
return MAGIC;
|
|
|
|
}
|
|
|
|
|
1990-10-14 12:07:46 +00:00
|
|
|
|
1997-08-02 03:10:38 +00:00
|
|
|
/* Magic for extension modules (built-in as well as dynamically
|
|
|
|
loaded). To prevent initializing an extension module more than
|
|
|
|
once, we keep a static dictionary 'extensions' keyed by module name
|
|
|
|
(for built-in modules) or by filename (for dynamically loaded
|
|
|
|
modules), containing these modules. A copy od the module's
|
|
|
|
dictionary is stored by calling _PyImport_FixupExtension()
|
|
|
|
immediately after the module initialization function succeeds. A
|
|
|
|
copy can be retrieved from there by calling
|
|
|
|
_PyImport_FindExtension(). */
|
1990-10-14 12:07:46 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *
|
1997-08-02 03:10:38 +00:00
|
|
|
_PyImport_FixupExtension(name, filename)
|
|
|
|
char *name;
|
|
|
|
char *filename;
|
|
|
|
{
|
|
|
|
PyObject *modules, *mod, *dict, *copy;
|
|
|
|
if (extensions == NULL) {
|
|
|
|
extensions = PyDict_New();
|
|
|
|
if (extensions == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
modules = PyImport_GetModuleDict();
|
|
|
|
mod = PyDict_GetItemString(modules, name);
|
|
|
|
if (mod == NULL || !PyModule_Check(mod)) {
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyErr_Format(PyExc_SystemError,
|
|
|
|
"_PyImport_FixupExtension: module %.200s not loaded", name);
|
1997-08-02 03:10:38 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
dict = PyModule_GetDict(mod);
|
|
|
|
if (dict == NULL)
|
|
|
|
return NULL;
|
|
|
|
copy = PyObject_CallMethod(dict, "copy", "");
|
|
|
|
if (copy == NULL)
|
|
|
|
return NULL;
|
|
|
|
PyDict_SetItemString(extensions, filename, copy);
|
|
|
|
Py_DECREF(copy);
|
|
|
|
return copy;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
_PyImport_FindExtension(name, filename)
|
|
|
|
char *name;
|
|
|
|
char *filename;
|
1990-12-20 15:06:42 +00:00
|
|
|
{
|
1997-08-02 03:10:38 +00:00
|
|
|
PyObject *dict, *mod, *mdict, *result;
|
|
|
|
if (extensions == NULL)
|
|
|
|
return NULL;
|
|
|
|
dict = PyDict_GetItemString(extensions, filename);
|
|
|
|
if (dict == NULL)
|
|
|
|
return NULL;
|
|
|
|
mod = PyImport_AddModule(name);
|
|
|
|
if (mod == NULL)
|
|
|
|
return NULL;
|
|
|
|
mdict = PyModule_GetDict(mod);
|
|
|
|
if (mdict == NULL)
|
|
|
|
return NULL;
|
|
|
|
result = PyObject_CallMethod(mdict, "update", "O", dict);
|
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
|
|
|
Py_DECREF(result);
|
|
|
|
if (Py_VerboseFlag)
|
|
|
|
fprintf(stderr, "import %s # previously loaded (%s)\n",
|
|
|
|
name, filename);
|
|
|
|
return mod;
|
1990-12-20 15:06:42 +00:00
|
|
|
}
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
|
|
|
|
/* Get the module object corresponding to a module name.
|
|
|
|
First check the modules dictionary if there's one there,
|
|
|
|
if not, create a new one and insert in in the modules dictionary.
|
1995-01-20 16:53:12 +00:00
|
|
|
Because the former action is most common, THIS DOES NOT RETURN A
|
|
|
|
'NEW' REFERENCE! */
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *
|
|
|
|
PyImport_AddModule(name)
|
1990-10-14 12:07:46 +00:00
|
|
|
char *name;
|
|
|
|
{
|
1997-08-02 03:10:38 +00:00
|
|
|
PyObject *modules = PyImport_GetModuleDict();
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *m;
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-08-02 03:10:38 +00:00
|
|
|
if ((m = PyDict_GetItemString(modules, name)) != NULL &&
|
1997-04-29 20:08:16 +00:00
|
|
|
PyModule_Check(m))
|
1990-12-20 15:06:42 +00:00
|
|
|
return m;
|
1997-04-29 20:08:16 +00:00
|
|
|
m = PyModule_New(name);
|
1990-10-14 12:07:46 +00:00
|
|
|
if (m == NULL)
|
|
|
|
return NULL;
|
1997-08-02 03:10:38 +00:00
|
|
|
if (PyDict_SetItemString(modules, name, m) != 0) {
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_DECREF(m);
|
1990-10-14 12:07:46 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_DECREF(m); /* Yes, it still exists, in modules! */
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1990-10-14 12:07:46 +00:00
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
1992-01-19 16:28:21 +00:00
|
|
|
|
1995-01-20 16:53:12 +00:00
|
|
|
/* Execute a code object in a module and return the module object
|
|
|
|
WITH INCREMENTED REFERENCE COUNT */
|
1992-01-19 16:28:21 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *
|
|
|
|
PyImport_ExecCodeModule(name, co)
|
1994-08-29 12:54:38 +00:00
|
|
|
char *name;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *co;
|
1994-08-29 12:54:38 +00:00
|
|
|
{
|
1997-08-02 03:10:38 +00:00
|
|
|
PyObject *modules = PyImport_GetModuleDict();
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *m, *d, *v;
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
m = PyImport_AddModule(name);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (m == NULL)
|
1994-08-29 12:54:38 +00:00
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
d = PyModule_GetDict(m);
|
|
|
|
if (PyDict_GetItemString(d, "__builtins__") == NULL) {
|
|
|
|
if (PyDict_SetItemString(d, "__builtins__",
|
|
|
|
PyEval_GetBuiltins()) != 0)
|
1995-01-09 17:53:26 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1996-05-16 20:43:40 +00:00
|
|
|
/* Remember the filename as the __file__ attribute */
|
1997-04-29 20:08:16 +00:00
|
|
|
if (PyDict_SetItemString(d, "__file__",
|
|
|
|
((PyCodeObject *)co)->co_filename) != 0)
|
|
|
|
PyErr_Clear(); /* Not important enough to report */
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
v = PyEval_EvalCode((PyCodeObject *)co, d, d);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (v == NULL)
|
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_DECREF(v);
|
1997-07-10 18:00:45 +00:00
|
|
|
|
1997-08-02 03:10:38 +00:00
|
|
|
if ((m = PyDict_GetItemString(modules, name)) == NULL) {
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Loaded module %.200s not found in sys.modules",
|
|
|
|
name);
|
1997-07-10 18:00:45 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_INCREF(m);
|
1995-01-02 19:04:15 +00:00
|
|
|
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Given a pathname for a Python source file, fill a buffer with the
|
|
|
|
pathname for the corresponding compiled file. Return the pathname
|
|
|
|
for the compiled file, or NULL if there's no space in the buffer.
|
|
|
|
Doesn't set an exception. */
|
|
|
|
|
|
|
|
static char *
|
|
|
|
make_compiled_pathname(pathname, buf, buflen)
|
|
|
|
char *pathname;
|
|
|
|
char *buf;
|
|
|
|
int buflen;
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
|
|
|
|
len = strlen(pathname);
|
|
|
|
if (len+2 > buflen)
|
|
|
|
return NULL;
|
|
|
|
strcpy(buf, pathname);
|
1997-03-11 18:37:35 +00:00
|
|
|
strcpy(buf+len, Py_OptimizeFlag ? "o" : "c");
|
1995-01-02 19:04:15 +00:00
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Given a pathname for a Python source file, its time of last
|
|
|
|
modification, and a pathname for a compiled file, check whether the
|
|
|
|
compiled file represents the same version of the source. If so,
|
|
|
|
return a FILE pointer for the compiled file, positioned just after
|
|
|
|
the header; if not, return NULL.
|
|
|
|
Doesn't set an exception. */
|
|
|
|
|
|
|
|
static FILE *
|
|
|
|
check_compiled_module(pathname, mtime, cpathname)
|
|
|
|
char *pathname;
|
|
|
|
long mtime;
|
|
|
|
char *cpathname;
|
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
long magic;
|
|
|
|
long pyc_mtime;
|
|
|
|
|
|
|
|
fp = fopen(cpathname, "rb");
|
|
|
|
if (fp == NULL)
|
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
magic = PyMarshal_ReadLongFromFile(fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (magic != MAGIC) {
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "# %s has bad magic\n", cpathname);
|
|
|
|
fclose(fp);
|
1994-08-29 12:54:38 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
pyc_mtime = PyMarshal_ReadLongFromFile(fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (pyc_mtime != mtime) {
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "# %s has bad mtime\n", cpathname);
|
|
|
|
fclose(fp);
|
1994-08-29 12:54:38 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "# %s matches %s\n", cpathname, pathname);
|
|
|
|
return fp;
|
|
|
|
}
|
1994-08-29 12:54:38 +00:00
|
|
|
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Read a code object from a file and check it for validity */
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyCodeObject *
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
read_compiled_module(cpathname, fp)
|
|
|
|
char *cpathname;
|
1995-01-02 19:04:15 +00:00
|
|
|
FILE *fp;
|
|
|
|
{
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *co;
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
co = PyMarshal_ReadObjectFromFile(fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Ugly: rd_object() may return NULL with or without error */
|
1997-04-29 20:08:16 +00:00
|
|
|
if (co == NULL || !PyCode_Check(co)) {
|
|
|
|
if (!PyErr_Occurred())
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Non-code object in %.200s", cpathname);
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_XDECREF(co);
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
1994-09-12 10:39:56 +00:00
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
return (PyCodeObject *)co;
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Load a module from a compiled file, execute it, and return its
|
1995-01-20 16:53:12 +00:00
|
|
|
module object WITH INCREMENTED REFERENCE COUNT */
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
load_compiled_module(name, cpathname, fp)
|
|
|
|
char *name;
|
|
|
|
char *cpathname;
|
|
|
|
FILE *fp;
|
|
|
|
{
|
|
|
|
long magic;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyCodeObject *co;
|
|
|
|
PyObject *m;
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
magic = PyMarshal_ReadLongFromFile(fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (magic != MAGIC) {
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Bad magic number in %.200s", cpathname);
|
1994-08-29 12:54:38 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
(void) PyMarshal_ReadLongFromFile(fp);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
co = read_compiled_module(cpathname, fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (co == NULL)
|
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "import %s # precompiled from %s\n",
|
|
|
|
name, cpathname);
|
1997-04-29 20:08:16 +00:00
|
|
|
m = PyImport_ExecCodeModule(name, (PyObject *)co);
|
|
|
|
Py_DECREF(co);
|
1995-01-02 19:04:15 +00:00
|
|
|
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Parse a source file and return the corresponding code object */
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyCodeObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
parse_source_module(pathname, fp)
|
|
|
|
char *pathname;
|
|
|
|
FILE *fp;
|
|
|
|
{
|
1997-04-29 20:08:16 +00:00
|
|
|
PyCodeObject *co;
|
1995-01-02 19:04:15 +00:00
|
|
|
node *n;
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1997-05-07 17:46:13 +00:00
|
|
|
n = PyParser_SimpleParseFile(fp, pathname, Py_file_input);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (n == NULL)
|
1994-08-29 12:54:38 +00:00
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
co = PyNode_Compile(n, pathname);
|
|
|
|
PyNode_Free(n);
|
1995-01-02 19:04:15 +00:00
|
|
|
|
|
|
|
return co;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Write a compiled module to a file, placing the time of last
|
|
|
|
modification of its source into the header.
|
|
|
|
Errors are ignored, if a write error occurs an attempt is made to
|
|
|
|
remove the file. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
write_compiled_module(co, cpathname, mtime)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyCodeObject *co;
|
1995-01-02 19:04:15 +00:00
|
|
|
char *cpathname;
|
|
|
|
long mtime;
|
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
fp = fopen(cpathname, "wb");
|
|
|
|
if (fp == NULL) {
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr,
|
|
|
|
"# can't create %s\n", cpathname);
|
|
|
|
return;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
PyMarshal_WriteLongToFile(MAGIC, fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
/* First write a 0 for mtime */
|
1997-04-29 20:08:16 +00:00
|
|
|
PyMarshal_WriteLongToFile(0L, fp);
|
|
|
|
PyMarshal_WriteObjectToFile((PyObject *)co, fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (ferror(fp)) {
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "# can't write %s\n", cpathname);
|
|
|
|
/* Don't keep partial file */
|
|
|
|
fclose(fp);
|
|
|
|
(void) unlink(cpathname);
|
|
|
|
return;
|
1994-08-29 12:54:38 +00:00
|
|
|
}
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Now write the true mtime */
|
|
|
|
fseek(fp, 4L, 0);
|
1997-04-29 20:08:16 +00:00
|
|
|
PyMarshal_WriteLongToFile(mtime, fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
fflush(fp);
|
|
|
|
fclose(fp);
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "# wrote %s\n", cpathname);
|
|
|
|
#ifdef macintosh
|
1996-02-21 15:29:20 +00:00
|
|
|
setfiletype(cpathname, 'Pyth', 'PYC ');
|
1995-01-02 19:04:15 +00:00
|
|
|
#endif
|
1994-08-29 12:54:38 +00:00
|
|
|
}
|
1995-01-02 19:04:15 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* Load a source module from a given file and return its module
|
1995-01-20 16:53:12 +00:00
|
|
|
object WITH INCREMENTED REFERENCE COUNT. If there's a matching
|
|
|
|
byte-compiled file, use that instead. */
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
load_source_module(name, pathname, fp)
|
1990-10-14 12:07:46 +00:00
|
|
|
char *name;
|
1995-01-02 19:04:15 +00:00
|
|
|
char *pathname;
|
|
|
|
FILE *fp;
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
1995-01-02 19:04:15 +00:00
|
|
|
long mtime;
|
|
|
|
FILE *fpc;
|
|
|
|
char buf[MAXPATHLEN+1];
|
|
|
|
char *cpathname;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyCodeObject *co;
|
|
|
|
PyObject *m;
|
1995-01-02 19:04:15 +00:00
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
mtime = PyOS_GetLastModificationTime(pathname, fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
cpathname = make_compiled_pathname(pathname, buf, MAXPATHLEN+1);
|
|
|
|
if (cpathname != NULL &&
|
|
|
|
(fpc = check_compiled_module(pathname, mtime, cpathname))) {
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
co = read_compiled_module(cpathname, fpc);
|
1995-01-02 19:04:15 +00:00
|
|
|
fclose(fpc);
|
|
|
|
if (co == NULL)
|
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "import %s # precompiled from %s\n",
|
|
|
|
name, cpathname);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
co = parse_source_module(pathname, fp);
|
|
|
|
if (co == NULL)
|
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "import %s # from %s\n",
|
|
|
|
name, pathname);
|
|
|
|
write_compiled_module(co, cpathname, mtime);
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
m = PyImport_ExecCodeModule(name, (PyObject *)co);
|
|
|
|
Py_DECREF(co);
|
1995-01-02 19:04:15 +00:00
|
|
|
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
/* Forward */
|
|
|
|
static PyObject *load_module Py_PROTO((char *, FILE *, char *, int));
|
|
|
|
static struct filedescr *find_module Py_PROTO((char *, PyObject *,
|
|
|
|
char *, int, FILE **));
|
|
|
|
|
|
|
|
/* Load a package and return its module object WITH INCREMENTED
|
|
|
|
REFERENCE COUNT */
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
load_package(name, pathname)
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
|
|
|
{
|
|
|
|
PyObject *m, *d, *file, *path;
|
|
|
|
int err;
|
|
|
|
char buf[MAXPATHLEN+1];
|
|
|
|
FILE *fp = NULL;
|
|
|
|
struct filedescr *fdp;
|
|
|
|
|
|
|
|
m = PyImport_AddModule(name);
|
|
|
|
if (m == NULL)
|
|
|
|
return NULL;
|
1997-09-06 18:52:03 +00:00
|
|
|
if (Py_VerboseFlag)
|
|
|
|
fprintf(stderr, "import %s # directory %s\n",
|
|
|
|
name, pathname);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
d = PyModule_GetDict(m);
|
|
|
|
file = PyString_FromString(pathname);
|
|
|
|
if (file == NULL)
|
|
|
|
return NULL;
|
|
|
|
path = Py_BuildValue("[O]", file);
|
|
|
|
if (path == NULL) {
|
|
|
|
Py_DECREF(file);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
err = PyDict_SetItemString(d, "__file__", file);
|
|
|
|
if (err == 0)
|
|
|
|
err = PyDict_SetItemString(d, "__path__", path);
|
|
|
|
if (err != 0) {
|
|
|
|
m = NULL;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
buf[0] = '\0';
|
|
|
|
fdp = find_module("__init__", path, buf, sizeof(buf), &fp);
|
|
|
|
if (fdp == NULL) {
|
|
|
|
if (PyErr_ExceptionMatches(PyExc_ImportError)) {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
m = NULL;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
m = load_module(name, fp, buf, fdp->type);
|
|
|
|
if (fp != NULL)
|
|
|
|
fclose(fp);
|
|
|
|
cleanup:
|
|
|
|
Py_XINCREF(m);
|
|
|
|
Py_XDECREF(path);
|
|
|
|
Py_XDECREF(file);
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper to test for built-in module */
|
|
|
|
|
|
|
|
static int
|
|
|
|
is_builtin(name)
|
|
|
|
char *name;
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; _PyImport_Inittab[i].name != NULL; i++) {
|
|
|
|
if (strcmp(name, _PyImport_Inittab[i].name) == 0) {
|
|
|
|
if (_PyImport_Inittab[i].initfunc == NULL)
|
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper to test for frozen module */
|
|
|
|
|
|
|
|
static int
|
|
|
|
is_frozen(name)
|
|
|
|
char *name;
|
|
|
|
{
|
|
|
|
struct _frozen *p;
|
|
|
|
for (p = PyImport_FrozenModules; ; p++) {
|
|
|
|
if (p->name == NULL)
|
|
|
|
break;
|
|
|
|
if (strcmp(p->name, name) == 0)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Search the path (default sys.path) for a module. Return the
|
|
|
|
corresponding filedescr struct, and (via return arguments) the
|
|
|
|
pathname and an open file. Return NULL if the module is not found. */
|
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
#ifdef MS_COREDLL
|
|
|
|
extern FILE *PyWin_FindRegisteredModule();
|
|
|
|
#endif
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
static struct filedescr *
|
|
|
|
find_module(name, path, buf, buflen, p_fp)
|
|
|
|
char *name;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *path;
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Output parameters: */
|
|
|
|
char *buf;
|
|
|
|
int buflen;
|
|
|
|
FILE **p_fp;
|
|
|
|
{
|
|
|
|
int i, npath, len, namelen;
|
1996-12-05 23:27:02 +00:00
|
|
|
struct filedescr *fdp = NULL;
|
1995-08-04 04:08:57 +00:00
|
|
|
FILE *fp = NULL;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
struct stat statbuf;
|
|
|
|
|
|
|
|
if (path == NULL) {
|
|
|
|
if (is_builtin(name)) {
|
|
|
|
static struct filedescr fd = {"", "", C_BUILTIN};
|
|
|
|
return &fd;
|
|
|
|
}
|
|
|
|
if (is_frozen(name)) {
|
|
|
|
static struct filedescr fd = {"", "", PY_FROZEN};
|
|
|
|
return &fd;
|
|
|
|
}
|
1993-10-15 13:01:11 +00:00
|
|
|
|
1996-08-22 23:10:58 +00:00
|
|
|
#ifdef MS_COREDLL
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
fp = PyWin_FindRegisteredModule(name, &fdp, buf, buflen);
|
|
|
|
if (fp != NULL) {
|
|
|
|
*p_fp = fp;
|
|
|
|
return fdp;
|
|
|
|
}
|
1996-04-09 02:39:59 +00:00
|
|
|
#endif
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
}
|
1996-04-09 02:39:59 +00:00
|
|
|
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
if (path == NULL)
|
1997-04-29 20:08:16 +00:00
|
|
|
path = PySys_GetObject("path");
|
|
|
|
if (path == NULL || !PyList_Check(path)) {
|
|
|
|
PyErr_SetString(PyExc_ImportError,
|
1995-08-04 04:08:57 +00:00
|
|
|
"sys.path must be a list of directory names");
|
1993-11-17 22:58:56 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
npath = PyList_Size(path);
|
1994-09-26 15:47:17 +00:00
|
|
|
namelen = strlen(name);
|
1993-11-17 22:58:56 +00:00
|
|
|
for (i = 0; i < npath; i++) {
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *v = PyList_GetItem(path, i);
|
|
|
|
if (!PyString_Check(v))
|
1993-11-17 22:58:56 +00:00
|
|
|
continue;
|
1997-04-29 20:08:16 +00:00
|
|
|
len = PyString_Size(v);
|
1997-07-21 14:54:36 +00:00
|
|
|
if (len + 2 + namelen + MAXSUFFIXSIZE >= buflen)
|
1994-09-26 15:47:17 +00:00
|
|
|
continue; /* Too long */
|
1997-04-29 20:08:16 +00:00
|
|
|
strcpy(buf, PyString_AsString(v));
|
1997-04-11 20:37:35 +00:00
|
|
|
if ((int)strlen(buf) != len)
|
1994-09-26 15:47:17 +00:00
|
|
|
continue; /* v contains '\0' */
|
1995-02-15 22:57:06 +00:00
|
|
|
#ifdef macintosh
|
1997-08-12 14:53:39 +00:00
|
|
|
#ifdef INTERN_STRINGS
|
|
|
|
/*
|
|
|
|
** Speedup: each sys.path item is interned, and
|
|
|
|
** FindResourceModule remembers which items refer to
|
|
|
|
** folders (so we don't have to bother trying to look
|
|
|
|
** into them for resources).
|
|
|
|
*/
|
|
|
|
PyString_InternInPlace(&PyList_GET_ITEM(path, i));
|
|
|
|
v = PyList_GET_ITEM(path, i);
|
|
|
|
#endif
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (PyMac_FindResourceModule((PyStringObject *)v, name, buf)) {
|
1997-04-29 20:08:16 +00:00
|
|
|
static struct filedescr resfiledescr =
|
|
|
|
{"", "", PY_RESOURCE};
|
1995-02-15 22:57:06 +00:00
|
|
|
|
|
|
|
return &resfiledescr;
|
|
|
|
}
|
|
|
|
#endif
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (len > 0 && buf[len-1] != SEP
|
|
|
|
#ifdef ALTSEP
|
|
|
|
&& buf[len-1] != ALTSEP
|
|
|
|
#endif
|
|
|
|
)
|
1995-01-02 19:04:15 +00:00
|
|
|
buf[len++] = SEP;
|
1997-08-12 14:53:39 +00:00
|
|
|
#ifdef macintosh
|
|
|
|
fdp = PyMac_FindModuleExtension(buf, &len, name);
|
|
|
|
if ( fdp )
|
|
|
|
fp = fopen(buf, fdp->mode);
|
|
|
|
#else
|
1996-05-23 22:51:04 +00:00
|
|
|
#ifdef IMPORT_8x3_NAMES
|
|
|
|
/* see if we are searching in directory dos_8x3 */
|
|
|
|
if (len > 7 && !strncmp(buf + len - 8, "dos_8x3", 7)){
|
|
|
|
int j;
|
1997-04-29 20:08:16 +00:00
|
|
|
char ch; /* limit name to 8 lower-case characters */
|
1996-05-23 22:51:04 +00:00
|
|
|
for (j = 0; (ch = name[j]) && j < 8; j++)
|
|
|
|
if (isupper(ch))
|
|
|
|
buf[len++] = tolower(ch);
|
|
|
|
else
|
|
|
|
buf[len++] = ch;
|
|
|
|
}
|
1996-06-20 14:18:34 +00:00
|
|
|
else /* Not in dos_8x3, use the full name */
|
1996-06-28 20:15:15 +00:00
|
|
|
#endif
|
1996-06-20 14:18:34 +00:00
|
|
|
{
|
1996-05-23 22:51:04 +00:00
|
|
|
strcpy(buf+len, name);
|
|
|
|
len += namelen;
|
|
|
|
}
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
#ifdef HAVE_STAT
|
|
|
|
if (stat(buf, &statbuf) == 0) {
|
|
|
|
static struct filedescr fd = {"", "", PKG_DIRECTORY};
|
|
|
|
if (S_ISDIR(statbuf.st_mode))
|
|
|
|
return &fd;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
/* XXX How are you going to test for directories? */
|
|
|
|
#endif
|
1997-04-29 20:08:16 +00:00
|
|
|
for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
|
1995-01-02 19:04:15 +00:00
|
|
|
strcpy(buf+len, fdp->suffix);
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag > 1)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "# trying %s\n", buf);
|
|
|
|
fp = fopen(buf, fdp->mode);
|
1993-11-17 22:58:56 +00:00
|
|
|
if (fp != NULL)
|
|
|
|
break;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
1997-08-12 14:53:39 +00:00
|
|
|
#endif /* !macintosh */
|
1993-11-17 22:58:56 +00:00
|
|
|
if (fp != NULL)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (fp == NULL) {
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"No module named %.200s", name);
|
1993-11-17 22:58:56 +00:00
|
|
|
return NULL;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
*p_fp = fp;
|
|
|
|
return fdp;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
static int init_builtin Py_PROTO((char *)); /* Forward */
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Load an external module using the default search path and return
|
1995-01-20 16:53:12 +00:00
|
|
|
its module object WITH INCREMENTED REFERENCE COUNT */
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
load_module(name, fp, buf, type)
|
1995-01-02 19:04:15 +00:00
|
|
|
char *name;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
FILE *fp;
|
|
|
|
char *buf;
|
|
|
|
int type;
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyObject *modules;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *m;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
int err;
|
1995-01-02 19:04:15 +00:00
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
/* First check that there's an open file (if we need one) */
|
|
|
|
switch (type) {
|
|
|
|
case PY_SOURCE:
|
|
|
|
case PY_COMPILED:
|
|
|
|
if (fp == NULL) {
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"file object required for import (type code %d)",
|
|
|
|
type);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
1995-01-02 19:04:15 +00:00
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
switch (type) {
|
1993-11-17 22:58:56 +00:00
|
|
|
|
|
|
|
case PY_SOURCE:
|
1995-01-02 19:04:15 +00:00
|
|
|
m = load_source_module(name, buf, fp);
|
1993-11-17 22:58:56 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PY_COMPILED:
|
1995-01-02 19:04:15 +00:00
|
|
|
m = load_compiled_module(name, buf, fp);
|
1993-11-17 22:58:56 +00:00
|
|
|
break;
|
1993-10-15 13:01:11 +00:00
|
|
|
|
1993-11-17 22:58:56 +00:00
|
|
|
case C_EXTENSION:
|
1997-04-29 20:08:16 +00:00
|
|
|
m = _PyImport_LoadDynamicModule(name, buf, fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
break;
|
1993-11-17 22:58:56 +00:00
|
|
|
|
1995-02-15 22:57:06 +00:00
|
|
|
#ifdef macintosh
|
|
|
|
case PY_RESOURCE:
|
|
|
|
m = PyMac_LoadResourceModule(name, buf);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
case PKG_DIRECTORY:
|
|
|
|
m = load_package(name, buf);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case C_BUILTIN:
|
|
|
|
case PY_FROZEN:
|
|
|
|
if (type == C_BUILTIN)
|
|
|
|
err = init_builtin(name);
|
|
|
|
else
|
|
|
|
err = PyImport_ImportFrozenModule(name);
|
|
|
|
if (err < 0)
|
|
|
|
goto failure;
|
|
|
|
if (err == 0) {
|
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Purported %s module %.200s not found",
|
|
|
|
type == C_BUILTIN ?
|
|
|
|
"builtin" : "frozen",
|
|
|
|
name);
|
|
|
|
goto failure;
|
|
|
|
}
|
|
|
|
modules = PyImport_GetModuleDict();
|
|
|
|
m = PyDict_GetItemString(modules, name);
|
|
|
|
if (m == NULL) {
|
|
|
|
PyErr_Format(
|
|
|
|
PyExc_ImportError,
|
|
|
|
"%s module %.200s not properly initialized",
|
|
|
|
type == C_BUILTIN ?
|
|
|
|
"builtin" : "frozen",
|
|
|
|
name);
|
|
|
|
goto failure;
|
|
|
|
}
|
|
|
|
Py_INCREF(m);
|
|
|
|
break;
|
|
|
|
|
1993-11-17 22:58:56 +00:00
|
|
|
default:
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
failure:
|
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Don't know how to import %.200s (type code %d)",
|
|
|
|
name, type);
|
1995-01-20 16:53:12 +00:00
|
|
|
m = NULL;
|
1993-11-17 22:58:56 +00:00
|
|
|
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
1993-11-17 22:58:56 +00:00
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Initialize a built-in module.
|
|
|
|
Return 1 for succes, 0 if the module is not found, and -1 with
|
|
|
|
an exception set if the initialization failed. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
init_builtin(name)
|
|
|
|
char *name;
|
|
|
|
{
|
1997-08-02 03:10:38 +00:00
|
|
|
struct _inittab *p;
|
|
|
|
PyObject *mod;
|
|
|
|
|
|
|
|
if ((mod = _PyImport_FindExtension(name, name)) != NULL)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
for (p = _PyImport_Inittab; p->name != NULL; p++) {
|
|
|
|
if (strcmp(name, p->name) == 0) {
|
|
|
|
if (p->initfunc == NULL) {
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Cannot re-init internal module %.200s",
|
|
|
|
name);
|
1995-01-02 19:04:15 +00:00
|
|
|
return -1;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1997-08-02 03:10:38 +00:00
|
|
|
fprintf(stderr, "import %s # builtin\n", name);
|
|
|
|
(*p->initfunc)();
|
1997-04-29 20:08:16 +00:00
|
|
|
if (PyErr_Occurred())
|
1995-01-02 19:04:15 +00:00
|
|
|
return -1;
|
1997-08-02 03:10:38 +00:00
|
|
|
if (_PyImport_FixupExtension(name, name) == NULL)
|
|
|
|
return -1;
|
1995-01-02 19:04:15 +00:00
|
|
|
return 1;
|
1990-12-20 15:06:42 +00:00
|
|
|
}
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
1995-01-02 19:04:15 +00:00
|
|
|
return 0;
|
1990-12-20 15:06:42 +00:00
|
|
|
}
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1995-08-04 04:08:57 +00:00
|
|
|
/* Frozen modules */
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1996-06-17 17:06:34 +00:00
|
|
|
static struct _frozen *
|
1995-08-04 04:08:57 +00:00
|
|
|
find_frozen(name)
|
1990-12-20 15:06:42 +00:00
|
|
|
char *name;
|
|
|
|
{
|
1996-06-17 17:06:34 +00:00
|
|
|
struct _frozen *p;
|
1995-08-04 04:08:57 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
for (p = PyImport_FrozenModules; ; p++) {
|
1995-01-02 19:04:15 +00:00
|
|
|
if (p->name == NULL)
|
1995-08-04 04:08:57 +00:00
|
|
|
return NULL;
|
1995-01-02 19:04:15 +00:00
|
|
|
if (strcmp(p->name, name) == 0)
|
|
|
|
break;
|
|
|
|
}
|
1995-08-04 04:08:57 +00:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-08-04 04:08:57 +00:00
|
|
|
get_frozen_object(name)
|
|
|
|
char *name;
|
|
|
|
{
|
1996-06-17 17:06:34 +00:00
|
|
|
struct _frozen *p = find_frozen(name);
|
1995-08-04 04:08:57 +00:00
|
|
|
|
|
|
|
if (p == NULL) {
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"No such frozen object named %.200s",
|
|
|
|
name);
|
1995-08-04 04:08:57 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
return PyMarshal_ReadObjectFromString((char *)p->code, p->size);
|
1995-08-04 04:08:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Initialize a frozen module.
|
|
|
|
Return 1 for succes, 0 if the module is not found, and -1 with
|
|
|
|
an exception set if the initialization failed.
|
|
|
|
This function is also used from frozenmain.c */
|
|
|
|
|
|
|
|
int
|
1997-04-29 20:08:16 +00:00
|
|
|
PyImport_ImportFrozenModule(name)
|
1995-08-04 04:08:57 +00:00
|
|
|
char *name;
|
|
|
|
{
|
1996-06-17 17:06:34 +00:00
|
|
|
struct _frozen *p = find_frozen(name);
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *co;
|
|
|
|
PyObject *m;
|
1995-08-04 04:08:57 +00:00
|
|
|
|
|
|
|
if (p == NULL)
|
|
|
|
return 0;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (Py_VerboseFlag)
|
1995-01-02 19:04:15 +00:00
|
|
|
fprintf(stderr, "import %s # frozen\n", name);
|
1997-04-29 20:08:16 +00:00
|
|
|
co = PyMarshal_ReadObjectFromString((char *)p->code, p->size);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (co == NULL)
|
|
|
|
return -1;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyCode_Check(co)) {
|
|
|
|
Py_DECREF(co);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"frozen object %.200s is not a code object",
|
|
|
|
name);
|
1995-01-02 19:04:15 +00:00
|
|
|
return -1;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
m = PyImport_ExecCodeModule(name, co);
|
|
|
|
Py_DECREF(co);
|
1995-01-20 16:53:12 +00:00
|
|
|
if (m == NULL)
|
|
|
|
return -1;
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_DECREF(m);
|
1995-01-20 16:53:12 +00:00
|
|
|
return 1;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
|
|
|
|
/* Import a module, either built-in, frozen, or external, and return
|
1995-01-20 16:53:12 +00:00
|
|
|
its module object WITH INCREMENTED REFERENCE COUNT */
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *
|
|
|
|
PyImport_ImportModule(name)
|
1990-10-14 12:07:46 +00:00
|
|
|
char *name;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
{
|
1997-09-06 18:52:03 +00:00
|
|
|
static PyObject *fromlist = NULL;
|
|
|
|
if (fromlist == NULL && strchr(name, '.') != NULL) {
|
|
|
|
fromlist = Py_BuildValue("[s]", "*");
|
|
|
|
if (fromlist == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return PyImport_ImportModuleEx(name, NULL, NULL, fromlist);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
}
|
|
|
|
|
1997-09-06 18:52:03 +00:00
|
|
|
/* Forward declarations for helper routines */
|
|
|
|
static PyObject *get_parent Py_PROTO((PyObject *globals,
|
|
|
|
char *buf, int *p_buflen));
|
|
|
|
static PyObject *load_next Py_PROTO((PyObject *mod, PyObject *altmod,
|
|
|
|
char **p_name, char *buf, int *p_buflen));
|
|
|
|
static int ensure_fromlist Py_PROTO((PyObject *mod, PyObject *fromlist,
|
|
|
|
char *buf, int buflen));
|
|
|
|
static PyObject * import_submodule Py_PROTO((PyObject *mod,
|
|
|
|
char *name, char *fullname));
|
|
|
|
|
|
|
|
/* The Magnum Opus of dotted-name import :-) */
|
|
|
|
|
|
|
|
/* XXX TO DO:
|
|
|
|
- Remember misses in package directories so package submodules
|
|
|
|
that all import the same toplevel module don't keep hitting on the
|
|
|
|
package directory first
|
|
|
|
*/
|
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyObject *
|
|
|
|
PyImport_ImportModuleEx(name, globals, locals, fromlist)
|
|
|
|
char *name;
|
|
|
|
PyObject *globals;
|
|
|
|
PyObject *locals;
|
|
|
|
PyObject *fromlist;
|
1997-09-06 18:52:03 +00:00
|
|
|
{
|
|
|
|
char buf[MAXPATHLEN+1];
|
|
|
|
int buflen = 0;
|
|
|
|
PyObject *parent, *head, *next, *tail;
|
|
|
|
|
|
|
|
parent = get_parent(globals, buf, &buflen);
|
|
|
|
if (parent == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
head = load_next(parent, Py_None, &name, buf, &buflen);
|
|
|
|
if (head == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
tail = head;
|
|
|
|
Py_INCREF(tail);
|
|
|
|
while (name) {
|
|
|
|
next = load_next(tail, tail, &name, buf, &buflen);
|
|
|
|
Py_DECREF(tail);
|
|
|
|
if (next == NULL) {
|
|
|
|
Py_DECREF(head);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
tail = next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fromlist != NULL) {
|
|
|
|
if (fromlist == Py_None || !PyObject_IsTrue(fromlist))
|
|
|
|
fromlist = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fromlist == NULL) {
|
|
|
|
Py_DECREF(tail);
|
|
|
|
return head;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_DECREF(head);
|
|
|
|
if (!ensure_fromlist(tail, fromlist, buf, buflen)) {
|
|
|
|
Py_DECREF(tail);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return tail;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
get_parent(globals, buf, p_buflen)
|
|
|
|
PyObject *globals;
|
|
|
|
char *buf;
|
|
|
|
int *p_buflen;
|
|
|
|
{
|
|
|
|
static PyObject *namestr = NULL;
|
|
|
|
static PyObject *pathstr = NULL;
|
|
|
|
PyObject *modname, *modpath, *modules, *parent;
|
|
|
|
|
|
|
|
if (globals == NULL || !PyDict_Check(globals))
|
|
|
|
return Py_None;
|
|
|
|
|
|
|
|
if (namestr == NULL) {
|
|
|
|
namestr = PyString_InternFromString("__name__");
|
|
|
|
if (namestr == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (pathstr == NULL) {
|
|
|
|
pathstr = PyString_InternFromString("__path__");
|
|
|
|
if (pathstr == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
*buf = '\0';
|
|
|
|
*p_buflen = 0;
|
|
|
|
modname = PyDict_GetItem(globals, namestr);
|
|
|
|
if (modname == NULL || !PyString_Check(modname))
|
|
|
|
return Py_None;
|
|
|
|
|
|
|
|
modpath = PyDict_GetItem(globals, pathstr);
|
|
|
|
if (modpath != NULL) {
|
|
|
|
int len = PyString_GET_SIZE(modname);
|
|
|
|
if (len > MAXPATHLEN) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Module name too long");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
strcpy(buf, PyString_AS_STRING(modname));
|
|
|
|
*p_buflen = len;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
char *start = PyString_AS_STRING(modname);
|
|
|
|
char *lastdot = strrchr(start, '.');
|
|
|
|
int len;
|
|
|
|
if (lastdot == NULL)
|
|
|
|
return Py_None;
|
|
|
|
len = lastdot - start;
|
|
|
|
if (len >= MAXPATHLEN) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Module name too long");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
strncpy(buf, start, len);
|
|
|
|
buf[len] = '\0';
|
|
|
|
*p_buflen = len;
|
|
|
|
}
|
|
|
|
|
|
|
|
modules = PyImport_GetModuleDict();
|
|
|
|
parent = PyDict_GetItemString(modules, buf);
|
|
|
|
if (parent == NULL)
|
|
|
|
parent = Py_None;
|
|
|
|
return parent;
|
|
|
|
/* We expect, but can't guarantee, if parent != None, that:
|
|
|
|
- parent.__name__ == buf
|
|
|
|
- parent.__dict__ is globals
|
|
|
|
If this is violated... Who cares? */
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
load_next(mod, altmod, p_name, buf, p_buflen)
|
|
|
|
PyObject *mod;
|
|
|
|
PyObject *altmod; /* Either None or same as mod */
|
|
|
|
char **p_name;
|
|
|
|
char *buf;
|
|
|
|
int *p_buflen;
|
|
|
|
{
|
|
|
|
char *name = *p_name;
|
|
|
|
char *dot = strchr(name, '.');
|
|
|
|
int len;
|
|
|
|
char *p;
|
|
|
|
PyObject *result;
|
|
|
|
|
|
|
|
if (dot == NULL) {
|
|
|
|
*p_name = NULL;
|
|
|
|
len = strlen(name);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*p_name = dot+1;
|
|
|
|
len = dot-name;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = buf + *p_buflen;
|
|
|
|
if (p != buf)
|
|
|
|
*p++ = '.';
|
|
|
|
if (p+len-buf >= MAXPATHLEN) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Module name too long");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
strncpy(p, name, len);
|
|
|
|
p[len] = '\0';
|
|
|
|
*p_buflen = p+len-buf;
|
|
|
|
|
|
|
|
result = import_submodule(mod, p, buf);
|
|
|
|
if (result == Py_None && altmod != mod) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
/* Here, altmod must be None */
|
|
|
|
strncpy(buf, name, len);
|
|
|
|
buf[len] = '\0';
|
|
|
|
*p_buflen = len;
|
|
|
|
result = import_submodule(altmod, buf, buf);
|
|
|
|
}
|
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (result == Py_None) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"No module named %.200s", name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ensure_fromlist(mod, fromlist, buf, buflen)
|
|
|
|
PyObject *mod;
|
|
|
|
PyObject *fromlist;
|
|
|
|
char *buf;
|
|
|
|
int buflen;
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!PyObject_HasAttrString(mod, "__path__"))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
for (i = 0; ; i++) {
|
|
|
|
PyObject *item = PySequence_GetItem(fromlist, i);
|
|
|
|
int hasit;
|
|
|
|
if (item == NULL) {
|
|
|
|
if (PyErr_ExceptionMatches(PyExc_IndexError)) {
|
|
|
|
PyErr_Clear();
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!PyString_Check(item)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"Item in ``from list'' not a string");
|
|
|
|
Py_DECREF(item);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (PyString_AS_STRING(item)[0] == '*') {
|
|
|
|
Py_DECREF(item);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
hasit = PyObject_HasAttr(mod, item);
|
|
|
|
if (!hasit) {
|
|
|
|
char *subname = PyString_AS_STRING(item);
|
|
|
|
PyObject *submod;
|
|
|
|
char *p;
|
|
|
|
if (buflen + strlen(subname) >= MAXPATHLEN) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Module name too long");
|
|
|
|
Py_DECREF(item);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
p = buf + buflen;
|
|
|
|
*p++ = '.';
|
|
|
|
strcpy(p, subname);
|
|
|
|
submod = import_submodule(mod, subname, buf);
|
|
|
|
Py_XDECREF(submod);
|
|
|
|
if (submod == NULL) {
|
|
|
|
Py_DECREF(item);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_DECREF(item);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
import_submodule(mod, subname, fullname)
|
|
|
|
PyObject *mod; /* May be None */
|
|
|
|
char *subname;
|
|
|
|
char *fullname;
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
1997-08-02 03:10:38 +00:00
|
|
|
PyObject *modules = PyImport_GetModuleDict();
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *m;
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-09-06 18:52:03 +00:00
|
|
|
/* Require:
|
|
|
|
if mod == None: subname == fullname
|
|
|
|
else: mod.__name__ + "." + subname == fullname
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ((m = PyDict_GetItemString(modules, fullname)) != NULL) {
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_INCREF(m);
|
1995-01-20 16:53:12 +00:00
|
|
|
}
|
|
|
|
else {
|
1997-09-06 18:52:03 +00:00
|
|
|
PyObject *path;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
char buf[MAXPATHLEN+1];
|
|
|
|
struct filedescr *fdp;
|
|
|
|
FILE *fp = NULL;
|
|
|
|
|
1997-09-06 18:52:03 +00:00
|
|
|
path = PyObject_GetAttrString(mod, "__path__");
|
|
|
|
if (path == NULL)
|
|
|
|
PyErr_Clear();
|
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
buf[0] = '\0';
|
1997-09-06 18:52:03 +00:00
|
|
|
fdp = find_module(subname, path,
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
buf, MAXPATHLEN+1, &fp);
|
1997-09-06 18:52:03 +00:00
|
|
|
if (fdp == NULL) {
|
|
|
|
if (!PyErr_ExceptionMatches(PyExc_ImportError))
|
|
|
|
return NULL;
|
|
|
|
PyErr_Clear();
|
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
|
|
|
}
|
|
|
|
m = load_module(fullname, fp, buf, fdp->type);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
1997-09-06 18:52:03 +00:00
|
|
|
if (m != NULL && mod != Py_None) {
|
|
|
|
if (PyObject_SetAttrString(mod, subname, m) < 0) {
|
|
|
|
Py_DECREF(m);
|
|
|
|
m = NULL;
|
|
|
|
}
|
|
|
|
}
|
1991-02-19 12:23:57 +00:00
|
|
|
}
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1990-10-14 12:07:46 +00:00
|
|
|
return m;
|
|
|
|
}
|
1990-10-26 14:58:58 +00:00
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
|
|
|
|
/* Re-import a module of any kind and return its module object, WITH
|
|
|
|
INCREMENTED REFERENCE COUNT */
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *
|
|
|
|
PyImport_ReloadModule(m)
|
|
|
|
PyObject *m;
|
1990-10-26 14:58:58 +00:00
|
|
|
{
|
1997-08-02 03:10:38 +00:00
|
|
|
PyObject *modules = PyImport_GetModuleDict();
|
1997-09-06 19:41:09 +00:00
|
|
|
PyObject *path = NULL;
|
|
|
|
char *name, *subname;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
char buf[MAXPATHLEN+1];
|
|
|
|
struct filedescr *fdp;
|
|
|
|
FILE *fp = NULL;
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
if (m == NULL || !PyModule_Check(m)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"reload() argument must be module");
|
1990-10-26 14:58:58 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
name = PyModule_GetName(m);
|
1993-11-17 22:58:56 +00:00
|
|
|
if (name == NULL)
|
|
|
|
return NULL;
|
1997-08-02 03:10:38 +00:00
|
|
|
if (m != PyDict_GetItemString(modules, name)) {
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"reload(): module %.200s not in sys.modules",
|
|
|
|
name);
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
1994-08-29 12:54:38 +00:00
|
|
|
}
|
1997-09-06 19:41:09 +00:00
|
|
|
subname = strrchr(name, '.');
|
|
|
|
if (subname == NULL)
|
|
|
|
subname = name;
|
|
|
|
else {
|
|
|
|
PyObject *parentname, *parent;
|
|
|
|
parentname = PyString_FromStringAndSize(name, (subname-name));
|
|
|
|
if (parentname == NULL)
|
|
|
|
return NULL;
|
|
|
|
parent = PyDict_GetItem(modules, parentname);
|
|
|
|
if (parent == NULL) {
|
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"reload(): parent %.200s not in sys.modules",
|
|
|
|
name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
subname++;
|
|
|
|
path = PyObject_GetAttrString(parent, "__path__");
|
|
|
|
if (path == NULL)
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
buf[0] = '\0';
|
1997-09-06 19:41:09 +00:00
|
|
|
fdp = find_module(subname, path, buf, MAXPATHLEN+1, &fp);
|
|
|
|
Py_XDECREF(path);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (fdp == NULL)
|
|
|
|
return NULL;
|
|
|
|
m = load_module(name, fp, buf, fdp->type);
|
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
return m;
|
1990-12-20 15:06:42 +00:00
|
|
|
}
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-08-14 20:11:26 +00:00
|
|
|
/* Higher-level import emulator which emulates the "import" statement
|
|
|
|
more accurately -- it invokes the __import__() function from the
|
|
|
|
builtins of the current globals. This means that the import is
|
|
|
|
done using whatever import hooks are installed in the current
|
|
|
|
environment, e.g. by "ni" or "rexec". */
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyImport_Import(module_name)
|
|
|
|
PyObject *module_name;
|
|
|
|
{
|
|
|
|
static PyObject *silly_list = NULL;
|
|
|
|
static PyObject *builtins_str = NULL;
|
|
|
|
static PyObject *import_str = NULL;
|
|
|
|
static PyObject *standard_builtins = NULL;
|
|
|
|
PyObject *globals = NULL;
|
|
|
|
PyObject *import = NULL;
|
|
|
|
PyObject *builtins = NULL;
|
|
|
|
PyObject *r = NULL;
|
|
|
|
|
|
|
|
/* Initialize constant string objects */
|
|
|
|
if (silly_list == NULL) {
|
|
|
|
import_str = PyString_InternFromString("__import__");
|
|
|
|
if (import_str == NULL)
|
|
|
|
return NULL;
|
|
|
|
builtins_str = PyString_InternFromString("__builtins__");
|
|
|
|
if (builtins_str == NULL)
|
|
|
|
return NULL;
|
|
|
|
silly_list = Py_BuildValue("[s]", "__doc__");
|
|
|
|
if (silly_list == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the builtins from current globals */
|
|
|
|
globals = PyEval_GetGlobals();
|
|
|
|
if(globals != NULL) {
|
|
|
|
builtins = PyObject_GetItem(globals, builtins_str);
|
|
|
|
if (builtins == NULL)
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* No globals -- use standard builtins, and fake globals */
|
|
|
|
PyErr_Clear();
|
|
|
|
|
|
|
|
if (standard_builtins == NULL) {
|
|
|
|
standard_builtins =
|
|
|
|
PyImport_ImportModule("__builtin__");
|
|
|
|
if (standard_builtins == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
builtins = standard_builtins;
|
|
|
|
Py_INCREF(builtins);
|
|
|
|
globals = Py_BuildValue("{OO}", builtins_str, builtins);
|
|
|
|
if (globals == NULL)
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the __import__ function from the builtins */
|
|
|
|
if (PyDict_Check(builtins))
|
|
|
|
import=PyObject_GetItem(builtins, import_str);
|
|
|
|
else
|
|
|
|
import=PyObject_GetAttr(builtins, import_str);
|
|
|
|
if (import == NULL)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Call the _import__ function with the proper argument list */
|
|
|
|
r = PyObject_CallFunction(import, "OOOO",
|
|
|
|
module_name, globals, globals, silly_list);
|
|
|
|
|
|
|
|
err:
|
|
|
|
Py_XDECREF(globals);
|
|
|
|
Py_XDECREF(builtins);
|
|
|
|
Py_XDECREF(import);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
/* Module 'imp' provides Python access to the primitives used for
|
|
|
|
importing modules.
|
|
|
|
*/
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_get_magic(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1990-12-20 15:06:42 +00:00
|
|
|
{
|
1995-01-02 19:04:15 +00:00
|
|
|
char buf[4];
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyArg_ParseTuple(args, ""))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
1997-04-11 20:37:35 +00:00
|
|
|
buf[0] = (char) ((MAGIC >> 0) & 0xff);
|
|
|
|
buf[1] = (char) ((MAGIC >> 8) & 0xff);
|
|
|
|
buf[2] = (char) ((MAGIC >> 16) & 0xff);
|
|
|
|
buf[3] = (char) ((MAGIC >> 24) & 0xff);
|
1995-01-02 19:04:15 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
return PyString_FromStringAndSize(buf, 4);
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_get_suffixes(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *list;
|
1995-01-02 19:04:15 +00:00
|
|
|
struct filedescr *fdp;
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyArg_ParseTuple(args, ""))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
list = PyList_New(0);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (list == NULL)
|
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
|
|
|
|
PyObject *item = Py_BuildValue("ssi",
|
1995-01-02 19:04:15 +00:00
|
|
|
fdp->suffix, fdp->mode, fdp->type);
|
|
|
|
if (item == NULL) {
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_DECREF(list);
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
1990-12-20 15:06:42 +00:00
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
if (PyList_Append(list, item) < 0) {
|
|
|
|
Py_DECREF(list);
|
|
|
|
Py_DECREF(item);
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_DECREF(item);
|
1990-10-26 14:58:58 +00:00
|
|
|
}
|
1995-01-02 19:04:15 +00:00
|
|
|
return list;
|
1990-10-26 14:58:58 +00:00
|
|
|
}
|
1991-02-19 12:23:57 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
call_find_module(name, path)
|
|
|
|
char *name;
|
1997-09-06 18:52:03 +00:00
|
|
|
PyObject *path; /* list or None or NULL */
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
1997-04-29 20:08:16 +00:00
|
|
|
extern int fclose Py_PROTO((FILE *));
|
|
|
|
PyObject *fob, *ret;
|
1995-01-02 19:04:15 +00:00
|
|
|
struct filedescr *fdp;
|
|
|
|
char pathname[MAXPATHLEN+1];
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
FILE *fp = NULL;
|
|
|
|
|
|
|
|
pathname[0] = '\0';
|
1997-09-06 18:52:03 +00:00
|
|
|
if (path == Py_None)
|
|
|
|
path = NULL;
|
1995-01-02 19:04:15 +00:00
|
|
|
fdp = find_module(name, path, pathname, MAXPATHLEN+1, &fp);
|
|
|
|
if (fdp == NULL)
|
|
|
|
return NULL;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (fp != NULL) {
|
|
|
|
fob = PyFile_FromFile(fp, pathname, fdp->mode, fclose);
|
|
|
|
if (fob == NULL) {
|
|
|
|
fclose(fp);
|
|
|
|
return NULL;
|
|
|
|
}
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
else {
|
|
|
|
fob = Py_None;
|
|
|
|
Py_INCREF(fob);
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
ret = Py_BuildValue("Os(ssi)",
|
1995-01-02 19:04:15 +00:00
|
|
|
fob, pathname, fdp->suffix, fdp->mode, fdp->type);
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_DECREF(fob);
|
1995-01-02 19:04:15 +00:00
|
|
|
return ret;
|
|
|
|
}
|
1991-02-19 12:23:57 +00:00
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
static PyObject *
|
|
|
|
imp_find_module(self, args)
|
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
PyObject *path = NULL;
|
1997-09-06 18:52:03 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "s|O", &name, &path))
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
return NULL;
|
|
|
|
return call_find_module(name, path);
|
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_init_builtin(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
int ret;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *m;
|
|
|
|
if (!PyArg_ParseTuple(args, "s", &name))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
|
|
|
ret = init_builtin(name);
|
|
|
|
if (ret < 0)
|
|
|
|
return NULL;
|
|
|
|
if (ret == 0) {
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
m = PyImport_AddModule(name);
|
|
|
|
Py_XINCREF(m);
|
1995-01-02 19:04:15 +00:00
|
|
|
return m;
|
|
|
|
}
|
1991-02-19 12:23:57 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_init_frozen(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
1991-02-19 12:23:57 +00:00
|
|
|
char *name;
|
1995-01-02 19:04:15 +00:00
|
|
|
int ret;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *m;
|
|
|
|
if (!PyArg_ParseTuple(args, "s", &name))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
ret = PyImport_ImportFrozenModule(name);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return NULL;
|
|
|
|
if (ret == 0) {
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
m = PyImport_AddModule(name);
|
|
|
|
Py_XINCREF(m);
|
1995-01-02 19:04:15 +00:00
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-08-04 04:08:57 +00:00
|
|
|
imp_get_frozen_object(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1995-08-04 04:08:57 +00:00
|
|
|
{
|
|
|
|
char *name;
|
1995-10-03 14:38:41 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "s", &name))
|
1995-08-04 04:08:57 +00:00
|
|
|
return NULL;
|
|
|
|
return get_frozen_object(name);
|
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_is_builtin(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1991-02-19 12:23:57 +00:00
|
|
|
{
|
1995-01-02 19:04:15 +00:00
|
|
|
char *name;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "s", &name))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
return PyInt_FromLong(is_builtin(name));
|
1991-02-19 12:23:57 +00:00
|
|
|
}
|
1993-04-01 20:59:32 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_is_frozen(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1993-04-01 20:59:32 +00:00
|
|
|
{
|
1995-01-02 19:04:15 +00:00
|
|
|
char *name;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "s", &name))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
return PyInt_FromLong(is_frozen(name));
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static FILE *
|
|
|
|
get_file(pathname, fob, mode)
|
|
|
|
char *pathname;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *fob;
|
1995-01-02 19:04:15 +00:00
|
|
|
char *mode;
|
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
if (fob == NULL) {
|
|
|
|
fp = fopen(pathname, mode);
|
|
|
|
if (fp == NULL)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
1993-04-01 20:59:32 +00:00
|
|
|
}
|
1995-01-02 19:04:15 +00:00
|
|
|
else {
|
1997-04-29 20:08:16 +00:00
|
|
|
fp = PyFile_AsFile(fob);
|
1995-01-02 19:04:15 +00:00
|
|
|
if (fp == NULL)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"bad/closed file object");
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
|
|
|
return fp;
|
1993-04-01 20:59:32 +00:00
|
|
|
}
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_load_compiled(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *fob = NULL;
|
|
|
|
PyObject *m;
|
1995-01-02 19:04:15 +00:00
|
|
|
FILE *fp;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "ss|O!", &name, &pathname,
|
1997-04-29 20:08:16 +00:00
|
|
|
&PyFile_Type, &fob))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
|
|
|
fp = get_file(pathname, fob, "rb");
|
|
|
|
if (fp == NULL)
|
|
|
|
return NULL;
|
|
|
|
m = load_compiled_module(name, pathname, fp);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (fob == NULL)
|
|
|
|
fclose(fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
return m;
|
|
|
|
}
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_load_dynamic(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *fob = NULL;
|
|
|
|
PyObject *m;
|
1995-07-07 22:50:36 +00:00
|
|
|
FILE *fp = NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "ss|O!", &name, &pathname,
|
|
|
|
&PyFile_Type, &fob))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (fob) {
|
1995-07-07 22:50:36 +00:00
|
|
|
fp = get_file(pathname, fob, "r");
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (fp == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
m = _PyImport_LoadDynamicModule(name, pathname, fp);
|
1995-07-07 22:50:36 +00:00
|
|
|
return m;
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_load_source(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1995-01-02 19:04:15 +00:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *fob = NULL;
|
|
|
|
PyObject *m;
|
1995-01-02 19:04:15 +00:00
|
|
|
FILE *fp;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "ss|O!", &name, &pathname,
|
1997-04-29 20:08:16 +00:00
|
|
|
&PyFile_Type, &fob))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
|
|
|
fp = get_file(pathname, fob, "r");
|
|
|
|
if (fp == NULL)
|
|
|
|
return NULL;
|
|
|
|
m = load_source_module(name, pathname, fp);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (fob == NULL)
|
|
|
|
fclose(fp);
|
1995-01-02 19:04:15 +00:00
|
|
|
return m;
|
|
|
|
}
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1995-02-15 22:57:06 +00:00
|
|
|
#ifdef macintosh
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-02-15 22:57:06 +00:00
|
|
|
imp_load_resource(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1995-02-15 22:57:06 +00:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *m;
|
1995-02-15 22:57:06 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "ss", &name, &pathname))
|
1995-02-15 22:57:06 +00:00
|
|
|
return NULL;
|
|
|
|
m = PyMac_LoadResourceModule(name, pathname);
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
#endif /* macintosh */
|
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
static PyObject *
|
|
|
|
imp_load_module(self, args)
|
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
PyObject *fob;
|
|
|
|
char *pathname;
|
|
|
|
char *suffix; /* Unused */
|
|
|
|
char *mode;
|
|
|
|
int type;
|
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "sOs(ssi)",
|
|
|
|
&name, &fob, &pathname,
|
|
|
|
&suffix, &mode, &type))
|
|
|
|
return NULL;
|
|
|
|
if (*mode && (*mode != 'r' || strchr(mode, '+') != NULL)) {
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"invalid file open mode %.200s", mode);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (fob == Py_None)
|
|
|
|
fp = NULL;
|
|
|
|
else {
|
|
|
|
if (!PyFile_Check(fob)) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"load_module arg#2 should be a file or None");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
fp = get_file(pathname, fob, mode);
|
|
|
|
if (fp == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return load_module(name, fp, pathname, type);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
imp_load_package(self, args)
|
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
|
|
|
if (!PyArg_ParseTuple(args, "ss", &name, &pathname))
|
|
|
|
return NULL;
|
|
|
|
return load_package(name, pathname);
|
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
1995-01-02 19:04:15 +00:00
|
|
|
imp_new_module(self, args)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
1994-08-29 12:54:38 +00:00
|
|
|
{
|
1995-01-02 19:04:15 +00:00
|
|
|
char *name;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "s", &name))
|
1995-01-02 19:04:15 +00:00
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
return PyModule_New(name);
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|
1994-08-29 12:54:38 +00:00
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
static PyObject *
|
|
|
|
imp_find_module_in_package(self, args)
|
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
|
|
|
{
|
1997-09-06 18:52:03 +00:00
|
|
|
char *name;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyObject *packagename = NULL;
|
|
|
|
PyObject *package;
|
|
|
|
PyObject *modules;
|
|
|
|
PyObject *path;
|
|
|
|
|
1997-09-06 18:52:03 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "s|S", &name, &packagename))
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
return NULL;
|
|
|
|
if (packagename == NULL || PyString_GET_SIZE(packagename) == 0) {
|
1997-09-06 18:52:03 +00:00
|
|
|
return call_find_module(name, (PyObject *)NULL);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
}
|
|
|
|
modules = PyImport_GetModuleDict();
|
|
|
|
package = PyDict_GetItem(modules, packagename);
|
|
|
|
if (package == NULL) {
|
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"No package named %.200s",
|
|
|
|
PyString_AS_STRING(packagename));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
path = PyObject_GetAttrString(package, "__path__");
|
|
|
|
if (path == NULL) {
|
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Package %.200s has no __path__ attribute",
|
|
|
|
PyString_AS_STRING(packagename));
|
|
|
|
return NULL;
|
|
|
|
}
|
1997-09-06 18:52:03 +00:00
|
|
|
return call_find_module(name, path);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
imp_find_module_in_directory(self, args)
|
|
|
|
PyObject *self;
|
|
|
|
PyObject *args;
|
|
|
|
{
|
1997-09-06 18:52:03 +00:00
|
|
|
char *name;
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyObject *directory;
|
|
|
|
PyObject *path;
|
|
|
|
|
1997-09-06 18:52:03 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "sS", &name, &directory))
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
return NULL;
|
|
|
|
path = Py_BuildValue("[O]", directory);
|
|
|
|
if (path == NULL)
|
|
|
|
return NULL;
|
1997-09-06 18:52:03 +00:00
|
|
|
return call_find_module(name, path);
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyMethodDef imp_methods[] = {
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
{"find_module", imp_find_module, 1},
|
|
|
|
{"find_module_in_directory", imp_find_module_in_directory, 1},
|
|
|
|
{"find_module_in_package", imp_find_module_in_package, 1},
|
1995-08-04 04:08:57 +00:00
|
|
|
{"get_frozen_object", imp_get_frozen_object, 1},
|
1995-01-02 19:04:15 +00:00
|
|
|
{"get_magic", imp_get_magic, 1},
|
|
|
|
{"get_suffixes", imp_get_suffixes, 1},
|
|
|
|
{"init_builtin", imp_init_builtin, 1},
|
|
|
|
{"init_frozen", imp_init_frozen, 1},
|
|
|
|
{"is_builtin", imp_is_builtin, 1},
|
|
|
|
{"is_frozen", imp_is_frozen, 1},
|
|
|
|
{"load_compiled", imp_load_compiled, 1},
|
|
|
|
{"load_dynamic", imp_load_dynamic, 1},
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
{"load_module", imp_load_module, 1},
|
|
|
|
{"load_package", imp_load_package, 1},
|
1995-02-15 22:57:06 +00:00
|
|
|
#ifdef macintosh
|
|
|
|
{"load_resource", imp_load_resource, 1},
|
|
|
|
#endif
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
{"load_source", imp_load_source, 1},
|
|
|
|
{"new_module", imp_new_module, 1},
|
1995-01-02 19:04:15 +00:00
|
|
|
{NULL, NULL} /* sentinel */
|
|
|
|
};
|
1994-08-29 12:54:38 +00:00
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
int
|
|
|
|
setint(d, name, value)
|
|
|
|
PyObject *d;
|
|
|
|
char *name;
|
|
|
|
int value;
|
|
|
|
{
|
|
|
|
PyObject *v;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
v = PyInt_FromLong((long)value);
|
|
|
|
err = PyDict_SetItemString(d, name, v);
|
|
|
|
Py_XDECREF(v);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
1995-01-02 19:04:15 +00:00
|
|
|
void
|
|
|
|
initimp()
|
|
|
|
{
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
PyObject *m, *d;
|
1994-08-29 12:54:38 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
m = Py_InitModule("imp", imp_methods);
|
|
|
|
d = PyModule_GetDict(m);
|
1994-08-29 12:54:38 +00:00
|
|
|
|
First part of package support.
This doesn't yet support "import a.b.c" or "from a.b.c import x", but
it does recognize directories. When importing a directory, it
initializes __path__ to a list containing the directory name, and
loads the __init__ module if found.
The (internal) find_module() and load_module() functions are
restructured so that they both also handle built-in and frozen modules
and Mac resources (and directories of course). The imp module's
find_module() and (new) load_module() also have this functionality.
Moreover, imp unconditionally defines constants for all module types,
and has two more new functions: find_module_in_package() and
find_module_in_directory().
There's also a new API function, PyImport_ImportModuleEx(), which
takes all four __import__ arguments (name, globals, locals, fromlist).
The last three may be NULL. This is currently the same as
PyImport_ImportModule() but in the future it will be able to do
relative dotted-path imports.
Other changes:
- bltinmodule.c: in __import__, call PyImport_ImportModuleEx().
- ceval.c: always pass the fromlist to __import__, even if it is a C
function, so PyImport_ImportModuleEx() is useful.
- getmtime.c: the function has a second argument, the FILE*, on which
it applies fstat(). According to Sjoerd this is much faster. The
first (pathname) argument is ignored, but remains for backward
compatibility (so the Mac version still works without changes).
By cleverly combining the new imp functionality, the full support for
dotted names in Python (mini.py, not checked in) is now about 7K,
lavishly commented (vs. 14K for ni plus 11K for ihooks, also lavishly
commented).
Good night!
1997-09-05 07:33:22 +00:00
|
|
|
if (setint(d, "SEARCH_ERROR", SEARCH_ERROR) < 0) goto failure;
|
|
|
|
if (setint(d, "PY_SOURCE", PY_SOURCE) < 0) goto failure;
|
|
|
|
if (setint(d, "PY_COMPILED", PY_COMPILED) < 0) goto failure;
|
|
|
|
if (setint(d, "C_EXTENSION", C_EXTENSION) < 0) goto failure;
|
|
|
|
if (setint(d, "PY_RESOURCE", PY_RESOURCE) < 0) goto failure;
|
|
|
|
if (setint(d, "PKG_DIRECTORY", PKG_DIRECTORY) < 0) goto failure;
|
|
|
|
if (setint(d, "C_BUILTIN", C_BUILTIN) < 0) goto failure;
|
|
|
|
if (setint(d, "PY_FROZEN", PY_FROZEN) < 0) goto failure;
|
|
|
|
|
|
|
|
failure:
|
|
|
|
;
|
1995-01-02 19:04:15 +00:00
|
|
|
}
|