1991-02-19 08:39:46 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Module definition and import implementation */
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
#include "Python.h"
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
#include "node.h"
|
|
|
|
#include "token.h"
|
|
|
|
#include "errcode.h"
|
1991-06-04 16:39:42 -03:00
|
|
|
#include "marshal.h"
|
|
|
|
#include "compile.h"
|
1992-08-05 16:58:53 -03:00
|
|
|
#include "eval.h"
|
1992-02-26 11:19:13 -04:00
|
|
|
#include "osdefs.h"
|
1995-01-02 15:04:15 -04:00
|
|
|
#include "importdl.h"
|
1995-02-15 18:57:06 -04:00
|
|
|
#ifdef macintosh
|
|
|
|
#include "macglue.h"
|
|
|
|
#endif
|
1991-06-04 16:39:42 -03:00
|
|
|
|
1996-12-05 19:27:02 -04: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 04:33:22 -03: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
|
|
|
|
|
1999-04-07 13:07:23 -03:00
|
|
|
#ifndef DONT_HAVE_SYS_TYPES_H
|
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 04:33:22 -03:00
|
|
|
#include <sys/types.h>
|
1999-04-07 13:07:23 -03:00
|
|
|
#endif
|
2000-09-20 17:31:38 -03:00
|
|
|
|
1999-04-07 13:07:23 -03:00
|
|
|
#ifndef DONT_HAVE_SYS_STAT_H
|
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 04:33:22 -03:00
|
|
|
#include <sys/stat.h>
|
2000-06-30 22:06:56 -03:00
|
|
|
#elif defined(HAVE_STAT_H)
|
|
|
|
#include <stat.h>
|
1999-04-07 13:07:23 -03: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 04:33:22 -03:00
|
|
|
|
2000-09-20 17:31:38 -03:00
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
|
|
|
|
1997-12-05 17:45:29 -04:00
|
|
|
#if defined(PYCC_VACPP)
|
|
|
|
/* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */
|
|
|
|
#define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG)
|
|
|
|
#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 04:33:22 -03:00
|
|
|
#ifndef S_ISDIR
|
|
|
|
#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2000-07-22 15:47:25 -03:00
|
|
|
extern time_t PyOS_GetLastModificationTime(char *, FILE *);
|
|
|
|
/* In getmtime.c */
|
1993-10-15 10:01:11 -03:00
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
/* Magic word to reject .pyc files generated by other Python versions */
|
1995-07-07 19:50:36 -03: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 17:06:11 -04:00
|
|
|
/* New way to come up with the magic number: (YEAR-1995), MONTH, DAY */
|
2000-08-27 17:31:27 -03:00
|
|
|
#define MAGIC (50823 | ((long)'\r'<<16) | ((long)'\n'<<24))
|
1992-01-19 12:28:21 -04:00
|
|
|
|
2000-05-01 17:19:08 -03:00
|
|
|
/* Magic word as global; note that _PyImport_Init() can change the
|
2000-06-30 01:59:17 -03:00
|
|
|
value of this global to accommodate for alterations of how the
|
2000-05-01 17:19:08 -03:00
|
|
|
compiler works which are enabled by command line switches. */
|
|
|
|
static long pyc_magic = MAGIC;
|
|
|
|
|
1997-08-02 00:10:38 -03:00
|
|
|
/* See _PyImport_FixupExtension() below */
|
|
|
|
static PyObject *extensions = NULL;
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1997-10-31 14:37:24 -04:00
|
|
|
/* This table is defined in config.c: */
|
|
|
|
extern struct _inittab _PyImport_Inittab[];
|
|
|
|
|
|
|
|
struct _inittab *PyImport_Inittab = _PyImport_Inittab;
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1999-12-20 17:23:41 -04:00
|
|
|
/* these tables define the module suffixes that Python recognizes */
|
|
|
|
struct filedescr * _PyImport_Filetab = NULL;
|
|
|
|
static const struct filedescr _PyImport_StandardFiletab[] = {
|
|
|
|
{".py", "r", PY_SOURCE},
|
|
|
|
{".pyc", "rb", PY_COMPILED},
|
|
|
|
{0, 0}
|
|
|
|
};
|
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
/* Initialize things */
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
_PyImport_Init(void)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
1999-12-20 17:23:41 -04:00
|
|
|
const struct filedescr *scan;
|
|
|
|
struct filedescr *filetab;
|
|
|
|
int countD = 0;
|
|
|
|
int countS = 0;
|
|
|
|
|
|
|
|
/* prepare _PyImport_Filetab: copy entries from
|
|
|
|
_PyImport_DynLoadFiletab and _PyImport_StandardFiletab.
|
|
|
|
*/
|
|
|
|
for (scan = _PyImport_DynLoadFiletab; scan->suffix != NULL; ++scan)
|
|
|
|
++countD;
|
|
|
|
for (scan = _PyImport_StandardFiletab; scan->suffix != NULL; ++scan)
|
|
|
|
++countS;
|
2000-05-03 20:44:39 -03:00
|
|
|
filetab = PyMem_NEW(struct filedescr, countD + countS + 1);
|
1999-12-20 17:23:41 -04:00
|
|
|
memcpy(filetab, _PyImport_DynLoadFiletab,
|
|
|
|
countD * sizeof(struct filedescr));
|
|
|
|
memcpy(filetab + countD, _PyImport_StandardFiletab,
|
|
|
|
countS * sizeof(struct filedescr));
|
|
|
|
filetab[countD + countS].suffix = NULL;
|
|
|
|
|
|
|
|
_PyImport_Filetab = filetab;
|
|
|
|
|
1997-03-11 14:37:35 -04:00
|
|
|
if (Py_OptimizeFlag) {
|
1999-12-20 17:23:41 -04:00
|
|
|
/* Replace ".pyc" with ".pyo" in _PyImport_Filetab */
|
|
|
|
for (; filetab->suffix != NULL; filetab++) {
|
|
|
|
if (strcmp(filetab->suffix, ".pyc") == 0)
|
|
|
|
filetab->suffix = ".pyo";
|
1997-03-11 14:37:35 -04:00
|
|
|
}
|
|
|
|
}
|
2000-05-01 17:19:08 -03:00
|
|
|
|
|
|
|
if (Py_UnicodeFlag) {
|
|
|
|
/* Fix the pyc_magic so that byte compiled code created
|
|
|
|
using the all-Unicode method doesn't interfere with
|
|
|
|
code created in normal operation mode. */
|
|
|
|
pyc_magic = MAGIC + 1;
|
|
|
|
}
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1997-08-02 00:10:38 -03:00
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
_PyImport_Fini(void)
|
1997-08-02 00:10:38 -03:00
|
|
|
{
|
|
|
|
Py_XDECREF(extensions);
|
|
|
|
extensions = NULL;
|
2000-10-03 13:02:05 -03:00
|
|
|
PyMem_DEL(_PyImport_Filetab);
|
|
|
|
_PyImport_Filetab = NULL;
|
1997-08-02 00:10:38 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-03-03 18:26:50 -04:00
|
|
|
/* Locking primitives to prevent parallel imports of the same module
|
|
|
|
in different threads to return with a partially loaded module.
|
|
|
|
These calls are serialized by the global interpreter lock. */
|
|
|
|
|
|
|
|
#ifdef WITH_THREAD
|
|
|
|
|
1998-10-01 17:42:43 -03:00
|
|
|
#include "pythread.h"
|
1998-03-03 18:26:50 -04:00
|
|
|
|
1998-12-21 15:32:43 -04:00
|
|
|
static PyThread_type_lock import_lock = 0;
|
1998-03-03 18:26:50 -04:00
|
|
|
static long import_lock_thread = -1;
|
|
|
|
static int import_lock_level = 0;
|
|
|
|
|
|
|
|
static void
|
2000-07-22 15:47:25 -03:00
|
|
|
lock_import(void)
|
1998-03-03 18:26:50 -04:00
|
|
|
{
|
1998-12-21 15:32:43 -04:00
|
|
|
long me = PyThread_get_thread_ident();
|
1998-03-03 18:26:50 -04:00
|
|
|
if (me == -1)
|
|
|
|
return; /* Too bad */
|
|
|
|
if (import_lock == NULL)
|
1998-12-21 15:32:43 -04:00
|
|
|
import_lock = PyThread_allocate_lock();
|
1998-03-03 18:26:50 -04:00
|
|
|
if (import_lock_thread == me) {
|
|
|
|
import_lock_level++;
|
|
|
|
return;
|
|
|
|
}
|
1998-12-21 15:32:43 -04:00
|
|
|
if (import_lock_thread != -1 || !PyThread_acquire_lock(import_lock, 0)) {
|
1998-03-03 18:26:50 -04:00
|
|
|
PyThreadState *tstate = PyEval_SaveThread();
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_acquire_lock(import_lock, 1);
|
1998-03-03 18:26:50 -04:00
|
|
|
PyEval_RestoreThread(tstate);
|
|
|
|
}
|
|
|
|
import_lock_thread = me;
|
|
|
|
import_lock_level = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-22 15:47:25 -03:00
|
|
|
unlock_import(void)
|
1998-03-03 18:26:50 -04:00
|
|
|
{
|
1998-12-21 15:32:43 -04:00
|
|
|
long me = PyThread_get_thread_ident();
|
1998-03-03 18:26:50 -04:00
|
|
|
if (me == -1)
|
|
|
|
return; /* Too bad */
|
|
|
|
if (import_lock_thread != me)
|
|
|
|
Py_FatalError("unlock_import: not holding the import lock");
|
|
|
|
import_lock_level--;
|
|
|
|
if (import_lock_level == 0) {
|
|
|
|
import_lock_thread = -1;
|
1998-12-21 15:32:43 -04:00
|
|
|
PyThread_release_lock(import_lock);
|
1998-03-03 18:26:50 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
#define lock_import()
|
|
|
|
#define unlock_import()
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
1997-08-02 00:10:38 -03:00
|
|
|
/* Helper for sys */
|
|
|
|
|
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_GetModuleDict(void)
|
1997-08-02 00:10:38 -03:00
|
|
|
{
|
|
|
|
PyInterpreterState *interp = PyThreadState_Get()->interp;
|
|
|
|
if (interp->modules == NULL)
|
|
|
|
Py_FatalError("PyImport_GetModuleDict: no module dictionary!");
|
|
|
|
return interp->modules;
|
|
|
|
}
|
|
|
|
|
1991-12-16 09:06:34 -04:00
|
|
|
|
1998-02-06 13:16:02 -04:00
|
|
|
/* List of names to clear in sys */
|
|
|
|
static char* sys_deletes[] = {
|
1998-02-19 16:58:44 -04:00
|
|
|
"path", "argv", "ps1", "ps2", "exitfunc",
|
1998-02-06 13:16:02 -04:00
|
|
|
"exc_type", "exc_value", "exc_traceback",
|
|
|
|
"last_type", "last_value", "last_traceback",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
1998-02-19 16:58:44 -04:00
|
|
|
static char* sys_files[] = {
|
|
|
|
"stdin", "__stdin__",
|
|
|
|
"stdout", "__stdout__",
|
|
|
|
"stderr", "__stderr__",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
1998-02-06 13:16:02 -04:00
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
/* Un-initialize things, as good as we can */
|
1991-12-16 09:06:34 -04:00
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_Cleanup(void)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
1998-01-19 17:58:26 -04:00
|
|
|
int pos, ndone;
|
|
|
|
char *name;
|
|
|
|
PyObject *key, *value, *dict;
|
1997-08-02 00:10:38 -03:00
|
|
|
PyInterpreterState *interp = PyThreadState_Get()->interp;
|
1998-01-19 17:58:26 -04:00
|
|
|
PyObject *modules = interp->modules;
|
|
|
|
|
|
|
|
if (modules == NULL)
|
|
|
|
return; /* Already done */
|
|
|
|
|
1998-02-06 13:16:02 -04:00
|
|
|
/* Delete some special variables first. These are common
|
|
|
|
places where user values hide and people complain when their
|
|
|
|
destructors fail. Since the modules containing them are
|
|
|
|
deleted *last* of all, they would come too late in the normal
|
|
|
|
destruction order. Sigh. */
|
|
|
|
|
|
|
|
value = PyDict_GetItemString(modules, "__builtin__");
|
|
|
|
if (value != NULL && PyModule_Check(value)) {
|
|
|
|
dict = PyModule_GetDict(value);
|
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# clear __builtin__._\n");
|
1998-02-06 13:16:02 -04:00
|
|
|
PyDict_SetItemString(dict, "_", Py_None);
|
|
|
|
}
|
|
|
|
value = PyDict_GetItemString(modules, "sys");
|
|
|
|
if (value != NULL && PyModule_Check(value)) {
|
|
|
|
char **p;
|
1998-02-19 16:58:44 -04:00
|
|
|
PyObject *v;
|
1998-02-06 13:16:02 -04:00
|
|
|
dict = PyModule_GetDict(value);
|
|
|
|
for (p = sys_deletes; *p != NULL; p++) {
|
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# clear sys.%s\n", *p);
|
1998-02-06 13:16:02 -04:00
|
|
|
PyDict_SetItemString(dict, *p, Py_None);
|
|
|
|
}
|
1998-02-19 16:58:44 -04:00
|
|
|
for (p = sys_files; *p != NULL; p+=2) {
|
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# restore sys.%s\n", *p);
|
1998-02-19 16:58:44 -04:00
|
|
|
v = PyDict_GetItemString(dict, *(p+1));
|
|
|
|
if (v == NULL)
|
|
|
|
v = Py_None;
|
|
|
|
PyDict_SetItemString(dict, *p, v);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First, delete __main__ */
|
|
|
|
value = PyDict_GetItemString(modules, "__main__");
|
|
|
|
if (value != NULL && PyModule_Check(value)) {
|
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# cleanup __main__\n");
|
1998-02-19 16:58:44 -04:00
|
|
|
_PyModule_Clear(value);
|
|
|
|
PyDict_SetItemString(modules, "__main__", Py_None);
|
1998-02-06 13:16:02 -04:00
|
|
|
}
|
|
|
|
|
1998-01-19 17:58:26 -04:00
|
|
|
/* The special treatment of __builtin__ here is because even
|
|
|
|
when it's not referenced as a module, its dictionary is
|
|
|
|
referenced by almost every module's __builtins__. Since
|
|
|
|
deleting a module clears its dictionary (even if there are
|
|
|
|
references left to it), we need to delete the __builtin__
|
|
|
|
module last. Likewise, we don't delete sys until the very
|
|
|
|
end because it is implicitly referenced (e.g. by print).
|
|
|
|
|
|
|
|
Also note that we 'delete' modules by replacing their entry
|
|
|
|
in the modules dict with None, rather than really deleting
|
|
|
|
them; this avoids a rehash of the modules dictionary and
|
|
|
|
also marks them as "non existent" so they won't be
|
|
|
|
re-imported. */
|
|
|
|
|
1998-02-19 16:58:44 -04:00
|
|
|
/* Next, repeatedly delete modules with a reference count of
|
1998-01-19 17:58:26 -04:00
|
|
|
one (skipping __builtin__ and sys) and delete them */
|
|
|
|
do {
|
|
|
|
ndone = 0;
|
1997-08-02 00:10:38 -03:00
|
|
|
pos = 0;
|
1998-01-19 17:58:26 -04:00
|
|
|
while (PyDict_Next(modules, &pos, &key, &value)) {
|
|
|
|
if (value->ob_refcnt != 1)
|
|
|
|
continue;
|
1998-10-01 12:24:50 -03:00
|
|
|
if (PyString_Check(key) && PyModule_Check(value)) {
|
|
|
|
name = PyString_AS_STRING(key);
|
1998-01-19 17:58:26 -04:00
|
|
|
if (strcmp(name, "__builtin__") == 0)
|
|
|
|
continue;
|
|
|
|
if (strcmp(name, "sys") == 0)
|
|
|
|
continue;
|
1998-02-06 13:16:02 -04:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr(
|
1998-02-06 13:16:02 -04:00
|
|
|
"# cleanup[1] %s\n", name);
|
1998-02-19 16:58:44 -04:00
|
|
|
_PyModule_Clear(value);
|
1998-01-19 17:58:26 -04:00
|
|
|
PyDict_SetItem(modules, key, Py_None);
|
|
|
|
ndone++;
|
1997-08-02 00:10:38 -03:00
|
|
|
}
|
|
|
|
}
|
1998-01-19 17:58:26 -04:00
|
|
|
} while (ndone > 0);
|
|
|
|
|
|
|
|
/* Next, delete all modules (still skipping __builtin__ and sys) */
|
|
|
|
pos = 0;
|
|
|
|
while (PyDict_Next(modules, &pos, &key, &value)) {
|
1998-10-01 12:24:50 -03:00
|
|
|
if (PyString_Check(key) && PyModule_Check(value)) {
|
|
|
|
name = PyString_AS_STRING(key);
|
1998-01-19 17:58:26 -04:00
|
|
|
if (strcmp(name, "__builtin__") == 0)
|
|
|
|
continue;
|
|
|
|
if (strcmp(name, "sys") == 0)
|
|
|
|
continue;
|
1998-02-06 13:16:02 -04:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# cleanup[2] %s\n", name);
|
1998-02-19 16:58:44 -04:00
|
|
|
_PyModule_Clear(value);
|
1998-01-19 17:58:26 -04:00
|
|
|
PyDict_SetItem(modules, key, Py_None);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Next, delete sys and __builtin__ (in that order) */
|
|
|
|
value = PyDict_GetItemString(modules, "sys");
|
|
|
|
if (value != NULL && PyModule_Check(value)) {
|
1998-02-06 13:16:02 -04:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# cleanup sys\n");
|
1998-02-19 16:58:44 -04:00
|
|
|
_PyModule_Clear(value);
|
1998-01-19 17:58:26 -04:00
|
|
|
PyDict_SetItemString(modules, "sys", Py_None);
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
1998-01-19 17:58:26 -04:00
|
|
|
value = PyDict_GetItemString(modules, "__builtin__");
|
|
|
|
if (value != NULL && PyModule_Check(value)) {
|
1998-02-06 13:16:02 -04:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# cleanup __builtin__\n");
|
1998-02-19 16:58:44 -04:00
|
|
|
_PyModule_Clear(value);
|
1998-01-19 17:58:26 -04:00
|
|
|
PyDict_SetItemString(modules, "__builtin__", Py_None);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finally, clear and delete the modules directory */
|
|
|
|
PyDict_Clear(modules);
|
|
|
|
interp->modules = NULL;
|
|
|
|
Py_DECREF(modules);
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
1990-12-20 11:06:42 -04:00
|
|
|
|
1991-04-03 15:03:52 -04:00
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
/* Helper for pythonrun.c -- return magic number */
|
1994-09-14 10:31:04 -03:00
|
|
|
|
|
|
|
long
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_GetMagicNumber(void)
|
1994-09-14 10:31:04 -03:00
|
|
|
{
|
2000-05-01 17:19:08 -03:00
|
|
|
return pyc_magic;
|
1994-09-14 10:31:04 -03:00
|
|
|
}
|
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
|
1997-08-02 00:10:38 -03: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 09:07:46 -03:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
_PyImport_FixupExtension(char *name, char *filename)
|
1997-08-02 00:10:38 -03:00
|
|
|
{
|
|
|
|
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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_SystemError,
|
|
|
|
"_PyImport_FixupExtension: module %.200s not loaded", name);
|
1997-08-02 00:10:38 -03: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 *
|
2000-07-22 15:47:25 -03:00
|
|
|
_PyImport_FindExtension(char *name, char *filename)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1997-08-02 00:10:38 -03: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)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("import %s # previously loaded (%s)\n",
|
1997-08-02 00:10:38 -03:00
|
|
|
name, filename);
|
|
|
|
return mod;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
1995-01-02 15:04:15 -04: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 12:53:12 -04:00
|
|
|
Because the former action is most common, THIS DOES NOT RETURN A
|
|
|
|
'NEW' REFERENCE! */
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_AddModule(char *name)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-08-02 00:10:38 -03:00
|
|
|
PyObject *modules = PyImport_GetModuleDict();
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *m;
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-08-02 00:10:38 -03:00
|
|
|
if ((m = PyDict_GetItemString(modules, name)) != NULL &&
|
1997-04-29 17:08:16 -03:00
|
|
|
PyModule_Check(m))
|
1990-12-20 11:06:42 -04:00
|
|
|
return m;
|
1997-04-29 17:08:16 -03:00
|
|
|
m = PyModule_New(name);
|
1990-10-14 09:07:46 -03:00
|
|
|
if (m == NULL)
|
|
|
|
return NULL;
|
1997-08-02 00:10:38 -03:00
|
|
|
if (PyDict_SetItemString(modules, name, m) != 0) {
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(m);
|
1990-10-14 09:07:46 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(m); /* Yes, it still exists, in modules! */
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
1992-01-19 12:28:21 -04:00
|
|
|
|
1995-01-20 12:53:12 -04:00
|
|
|
/* Execute a code object in a module and return the module object
|
|
|
|
WITH INCREMENTED REFERENCE COUNT */
|
1992-01-19 12:28:21 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_ExecCodeModule(char *name, PyObject *co)
|
1998-02-11 01:53:02 -04:00
|
|
|
{
|
|
|
|
return PyImport_ExecCodeModuleEx(name, co, (char *)NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_ExecCodeModuleEx(char *name, PyObject *co, char *pathname)
|
1994-08-29 09:54:38 -03:00
|
|
|
{
|
1997-08-02 00:10:38 -03:00
|
|
|
PyObject *modules = PyImport_GetModuleDict();
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *m, *d, *v;
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
m = PyImport_AddModule(name);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (m == NULL)
|
1994-08-29 09:54:38 -03:00
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
d = PyModule_GetDict(m);
|
|
|
|
if (PyDict_GetItemString(d, "__builtins__") == NULL) {
|
|
|
|
if (PyDict_SetItemString(d, "__builtins__",
|
|
|
|
PyEval_GetBuiltins()) != 0)
|
1995-01-09 13:53:26 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
1996-05-16 17:43:40 -03:00
|
|
|
/* Remember the filename as the __file__ attribute */
|
1998-02-11 01:53:02 -04:00
|
|
|
v = NULL;
|
|
|
|
if (pathname != NULL) {
|
|
|
|
v = PyString_FromString(pathname);
|
|
|
|
if (v == NULL)
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
if (v == NULL) {
|
|
|
|
v = ((PyCodeObject *)co)->co_filename;
|
|
|
|
Py_INCREF(v);
|
|
|
|
}
|
|
|
|
if (PyDict_SetItemString(d, "__file__", v) != 0)
|
1997-04-29 17:08:16 -03:00
|
|
|
PyErr_Clear(); /* Not important enough to report */
|
1998-02-11 01:53:02 -04:00
|
|
|
Py_DECREF(v);
|
|
|
|
|
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 04:33:22 -03:00
|
|
|
v = PyEval_EvalCode((PyCodeObject *)co, d, d);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (v == NULL)
|
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(v);
|
1997-07-10 15:00:45 -03:00
|
|
|
|
1997-08-02 00:10:38 -03: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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Loaded module %.200s not found in sys.modules",
|
|
|
|
name);
|
1997-07-10 15:00:45 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_INCREF(m);
|
1995-01-02 15:04:15 -04: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 *
|
2000-07-22 15:47:25 -03:00
|
|
|
make_compiled_pathname(char *pathname, char *buf, size_t buflen)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
2000-06-30 13:18:57 -03:00
|
|
|
size_t len;
|
1995-01-02 15:04:15 -04:00
|
|
|
|
|
|
|
len = strlen(pathname);
|
|
|
|
if (len+2 > buflen)
|
|
|
|
return NULL;
|
|
|
|
strcpy(buf, pathname);
|
1997-03-11 14:37:35 -04:00
|
|
|
strcpy(buf+len, Py_OptimizeFlag ? "o" : "c");
|
1995-01-02 15:04:15 -04: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 *
|
2000-07-22 15:47:25 -03:00
|
|
|
check_compiled_module(char *pathname, long mtime, char *cpathname)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
long magic;
|
|
|
|
long pyc_mtime;
|
|
|
|
|
|
|
|
fp = fopen(cpathname, "rb");
|
|
|
|
if (fp == NULL)
|
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
magic = PyMarshal_ReadLongFromFile(fp);
|
2000-05-01 17:19:08 -03:00
|
|
|
if (magic != pyc_magic) {
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# %s has bad magic\n", cpathname);
|
1995-01-02 15:04:15 -04:00
|
|
|
fclose(fp);
|
1994-08-29 09:54:38 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
pyc_mtime = PyMarshal_ReadLongFromFile(fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (pyc_mtime != mtime) {
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# %s has bad mtime\n", cpathname);
|
1995-01-02 15:04:15 -04:00
|
|
|
fclose(fp);
|
1994-08-29 09:54:38 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# %s matches %s\n", cpathname, pathname);
|
1995-01-02 15:04:15 -04:00
|
|
|
return fp;
|
|
|
|
}
|
1994-08-29 09:54:38 -03:00
|
|
|
|
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
/* Read a code object from a file and check it for validity */
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyCodeObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
read_compiled_module(char *cpathname, FILE *fp)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *co;
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
co = PyMarshal_ReadObjectFromFile(fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
/* Ugly: rd_object() may return NULL with or without error */
|
1997-04-29 17:08:16 -03: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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Non-code object in %.200s", cpathname);
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_XDECREF(co);
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
1994-09-12 07:39:56 -03:00
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
return (PyCodeObject *)co;
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Load a module from a compiled file, execute it, and return its
|
1995-01-20 12:53:12 -04:00
|
|
|
module object WITH INCREMENTED REFERENCE COUNT */
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
load_compiled_module(char *name, char *cpathname, FILE *fp)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
|
|
|
long magic;
|
1997-04-29 17:08:16 -03:00
|
|
|
PyCodeObject *co;
|
|
|
|
PyObject *m;
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
magic = PyMarshal_ReadLongFromFile(fp);
|
2000-05-01 17:19:08 -03:00
|
|
|
if (magic != pyc_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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Bad magic number in %.200s", cpathname);
|
1994-08-29 09:54:38 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 17:08:16 -03: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 04:33:22 -03:00
|
|
|
co = read_compiled_module(cpathname, fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (co == NULL)
|
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("import %s # precompiled from %s\n",
|
1995-01-02 15:04:15 -04:00
|
|
|
name, cpathname);
|
1998-02-11 01:53:02 -04:00
|
|
|
m = PyImport_ExecCodeModuleEx(name, (PyObject *)co, cpathname);
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(co);
|
1995-01-02 15:04:15 -04:00
|
|
|
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Parse a source file and return the corresponding code object */
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyCodeObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
parse_source_module(char *pathname, FILE *fp)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
1997-04-29 17:08:16 -03:00
|
|
|
PyCodeObject *co;
|
1995-01-02 15:04:15 -04:00
|
|
|
node *n;
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1997-05-07 14:46:13 -03:00
|
|
|
n = PyParser_SimpleParseFile(fp, pathname, Py_file_input);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (n == NULL)
|
1994-08-29 09:54:38 -03:00
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
co = PyNode_Compile(n, pathname);
|
|
|
|
PyNode_Free(n);
|
1995-01-02 15:04:15 -04:00
|
|
|
|
|
|
|
return co;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-09-20 17:31:38 -03:00
|
|
|
/* Helper to open a bytecode file for writing in exclusive mode */
|
|
|
|
|
|
|
|
static FILE *
|
|
|
|
open_exclusive(char *filename)
|
|
|
|
{
|
|
|
|
#if defined(O_EXCL)&&defined(O_CREAT)&&defined(O_WRONLY)&&defined(O_TRUNC)
|
|
|
|
/* Use O_EXCL to avoid a race condition when another process tries to
|
|
|
|
write the same file. When that happens, our open() call fails,
|
|
|
|
which is just fine (since it's only a cache).
|
|
|
|
XXX If the file exists and is writable but the directory is not
|
|
|
|
writable, the file will never be written. Oh well.
|
|
|
|
*/
|
|
|
|
int fd;
|
|
|
|
(void) unlink(filename);
|
2000-09-29 01:03:10 -03:00
|
|
|
fd = open(filename, O_EXCL|O_CREAT|O_WRONLY|O_TRUNC
|
|
|
|
#ifdef O_BINARY
|
|
|
|
|O_BINARY /* necessary for Windows */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
, 0666);
|
2000-09-20 17:31:38 -03:00
|
|
|
if (fd < 0)
|
|
|
|
return NULL;
|
|
|
|
return fdopen(fd, "wb");
|
|
|
|
#else
|
|
|
|
/* Best we can do -- on Windows this can't happen anyway */
|
|
|
|
return fopen(filename, "wb");
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
/* 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
|
2000-07-22 15:47:25 -03:00
|
|
|
write_compiled_module(PyCodeObject *co, char *cpathname, long mtime)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
|
2000-09-20 17:31:38 -03:00
|
|
|
fp = open_exclusive(cpathname);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (fp == NULL) {
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr(
|
1995-01-02 15:04:15 -04:00
|
|
|
"# can't create %s\n", cpathname);
|
|
|
|
return;
|
|
|
|
}
|
2000-05-01 17:19:08 -03:00
|
|
|
PyMarshal_WriteLongToFile(pyc_magic, fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
/* First write a 0 for mtime */
|
1997-04-29 17:08:16 -03:00
|
|
|
PyMarshal_WriteLongToFile(0L, fp);
|
|
|
|
PyMarshal_WriteObjectToFile((PyObject *)co, fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (ferror(fp)) {
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# can't write %s\n", cpathname);
|
1995-01-02 15:04:15 -04:00
|
|
|
/* Don't keep partial file */
|
|
|
|
fclose(fp);
|
|
|
|
(void) unlink(cpathname);
|
|
|
|
return;
|
1994-08-29 09:54:38 -03:00
|
|
|
}
|
1995-01-02 15:04:15 -04:00
|
|
|
/* Now write the true mtime */
|
|
|
|
fseek(fp, 4L, 0);
|
1997-04-29 17:08:16 -03:00
|
|
|
PyMarshal_WriteLongToFile(mtime, fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
fflush(fp);
|
|
|
|
fclose(fp);
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# wrote %s\n", cpathname);
|
1995-01-02 15:04:15 -04:00
|
|
|
#ifdef macintosh
|
2000-07-11 18:59:16 -03:00
|
|
|
PyMac_setfiletype(cpathname, 'Pyth', 'PYC ');
|
1995-01-02 15:04:15 -04:00
|
|
|
#endif
|
1994-08-29 09:54:38 -03:00
|
|
|
}
|
1995-01-02 15:04:15 -04:00
|
|
|
|
|
|
|
|
|
|
|
/* Load a source module from a given file and return its module
|
1995-01-20 12:53:12 -04:00
|
|
|
object WITH INCREMENTED REFERENCE COUNT. If there's a matching
|
|
|
|
byte-compiled file, use that instead. */
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
load_source_module(char *name, char *pathname, FILE *fp)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2000-06-30 13:18:57 -03:00
|
|
|
time_t mtime;
|
1995-01-02 15:04:15 -04:00
|
|
|
FILE *fpc;
|
|
|
|
char buf[MAXPATHLEN+1];
|
|
|
|
char *cpathname;
|
1997-04-29 17:08:16 -03:00
|
|
|
PyCodeObject *co;
|
|
|
|
PyObject *m;
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
mtime = PyOS_GetLastModificationTime(pathname, fp);
|
2000-06-30 13:18:57 -03:00
|
|
|
if (mtime == -1)
|
|
|
|
return NULL;
|
|
|
|
#if SIZEOF_TIME_T > 4
|
|
|
|
/* Python's .pyc timestamp handling presumes that the timestamp fits
|
|
|
|
in 4 bytes. This will be fine until sometime in the year 2038,
|
|
|
|
when a 4-byte signed time_t will overflow.
|
|
|
|
*/
|
|
|
|
if (mtime >> 32) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"modification time overflows a 4 bytes");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
cpathname = make_compiled_pathname(pathname, buf, (size_t)MAXPATHLEN+1);
|
1995-01-02 15:04:15 -04:00
|
|
|
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 04:33:22 -03:00
|
|
|
co = read_compiled_module(cpathname, fpc);
|
1995-01-02 15:04:15 -04:00
|
|
|
fclose(fpc);
|
|
|
|
if (co == NULL)
|
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("import %s # precompiled from %s\n",
|
1995-01-02 15:04:15 -04:00
|
|
|
name, cpathname);
|
1998-08-25 15:44:34 -03:00
|
|
|
pathname = cpathname;
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
co = parse_source_module(pathname, fp);
|
|
|
|
if (co == NULL)
|
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("import %s # from %s\n",
|
1995-01-02 15:04:15 -04:00
|
|
|
name, pathname);
|
|
|
|
write_compiled_module(co, cpathname, mtime);
|
|
|
|
}
|
1998-08-25 15:44:34 -03:00
|
|
|
m = PyImport_ExecCodeModuleEx(name, (PyObject *)co, pathname);
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(co);
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
/* Forward */
|
2000-07-09 00:09:57 -03:00
|
|
|
static PyObject *load_module(char *, FILE *, char *, int);
|
|
|
|
static struct filedescr *find_module(char *, PyObject *,
|
|
|
|
char *, size_t, FILE **);
|
|
|
|
static struct _frozen *find_frozen(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 04:33:22 -03:00
|
|
|
|
|
|
|
/* Load a package and return its module object WITH INCREMENTED
|
|
|
|
REFERENCE COUNT */
|
|
|
|
|
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
load_package(char *name, char *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 04:33:22 -03:00
|
|
|
{
|
|
|
|
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 15:52:03 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("import %s # directory %s\n",
|
1997-09-06 15:52:03 -03:00
|
|
|
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 04:33:22 -03: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_XDECREF(path);
|
|
|
|
Py_XDECREF(file);
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper to test for built-in module */
|
|
|
|
|
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
is_builtin(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 04:33:22 -03:00
|
|
|
{
|
|
|
|
int i;
|
1997-10-31 14:37:24 -04:00
|
|
|
for (i = 0; PyImport_Inittab[i].name != NULL; i++) {
|
|
|
|
if (strcmp(name, PyImport_Inittab[i].name) == 0) {
|
|
|
|
if (PyImport_Inittab[i].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 04:33:22 -03:00
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
#ifdef MS_COREDLL
|
2000-07-22 20:38:01 -03:00
|
|
|
extern FILE *PyWin_FindRegisteredModule(const char *, struct filedescr **,
|
|
|
|
char *, int);
|
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 04:33:22 -03:00
|
|
|
#endif
|
|
|
|
|
1998-02-13 13:18:36 -04:00
|
|
|
#ifdef CHECK_IMPORT_CASE
|
|
|
|
static int check_case(char *, int, int, char *);
|
|
|
|
#endif
|
|
|
|
|
2000-07-09 00:09:57 -03:00
|
|
|
static int find_init_module(char *); /* Forward */
|
1997-10-31 14:38:52 -04:00
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
static struct filedescr *
|
2000-07-22 15:47:25 -03:00
|
|
|
find_module(char *realname, PyObject *path, char *buf, size_t buflen,
|
|
|
|
FILE **p_fp)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
2000-06-30 13:18:57 -03:00
|
|
|
int i, npath;
|
|
|
|
size_t len, namelen;
|
1998-03-04 23:45:08 -04:00
|
|
|
struct _frozen *f;
|
1996-12-05 19:27:02 -04:00
|
|
|
struct filedescr *fdp = NULL;
|
1995-08-04 01:08:57 -03: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 04:33:22 -03:00
|
|
|
struct stat statbuf;
|
1998-03-04 23:45:08 -04:00
|
|
|
static struct filedescr fd_frozen = {"", "", PY_FROZEN};
|
|
|
|
static struct filedescr fd_builtin = {"", "", C_BUILTIN};
|
|
|
|
static struct filedescr fd_package = {"", "", PKG_DIRECTORY};
|
1998-08-11 12:07:39 -03:00
|
|
|
char name[MAXPATHLEN+1];
|
|
|
|
|
2000-06-30 13:18:57 -03:00
|
|
|
if (strlen(realname) > MAXPATHLEN) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError, "module name is too long");
|
|
|
|
return NULL;
|
|
|
|
}
|
1998-08-11 12:07:39 -03:00
|
|
|
strcpy(name, realname);
|
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 04:33:22 -03:00
|
|
|
|
1998-08-11 12:07:39 -03:00
|
|
|
if (path != NULL && PyString_Check(path)) {
|
|
|
|
/* Submodule of "frozen" package:
|
|
|
|
Set name to the fullname, path to NULL
|
|
|
|
and continue as "usual" */
|
|
|
|
if (PyString_Size(path) + 1 + strlen(name) >= (size_t)buflen) {
|
|
|
|
PyErr_SetString(PyExc_ImportError,
|
|
|
|
"full frozen module name too long");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
strcpy(buf, PyString_AsString(path));
|
|
|
|
strcat(buf, ".");
|
|
|
|
strcat(buf, name);
|
|
|
|
strcpy(name, buf);
|
|
|
|
path = 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 04:33:22 -03:00
|
|
|
if (path == NULL) {
|
|
|
|
if (is_builtin(name)) {
|
1998-03-04 23:45:08 -04:00
|
|
|
strcpy(buf, name);
|
|
|
|
return &fd_builtin;
|
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 04:33:22 -03:00
|
|
|
}
|
1998-03-04 23:45:08 -04:00
|
|
|
if ((f = find_frozen(name)) != NULL) {
|
|
|
|
strcpy(buf, name);
|
|
|
|
return &fd_frozen;
|
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 04:33:22 -03:00
|
|
|
}
|
1993-10-15 10:01:11 -03:00
|
|
|
|
1996-08-22 20:10:58 -03: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 04:33:22 -03:00
|
|
|
fp = PyWin_FindRegisteredModule(name, &fdp, buf, buflen);
|
|
|
|
if (fp != NULL) {
|
|
|
|
*p_fp = fp;
|
|
|
|
return fdp;
|
|
|
|
}
|
1996-04-08 23:39:59 -03:00
|
|
|
#endif
|
1998-03-04 23:45:08 -04:00
|
|
|
path = PySys_GetObject("path");
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
if (path == NULL || !PyList_Check(path)) {
|
|
|
|
PyErr_SetString(PyExc_ImportError,
|
1998-03-04 23:45:08 -04:00
|
|
|
"sys.path must be a list of directory names");
|
1993-11-17 18:58:56 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
npath = PyList_Size(path);
|
1994-09-26 12:47:17 -03:00
|
|
|
namelen = strlen(name);
|
1993-11-17 18:58:56 -04:00
|
|
|
for (i = 0; i < npath; i++) {
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *v = PyList_GetItem(path, i);
|
|
|
|
if (!PyString_Check(v))
|
1993-11-17 18:58:56 -04:00
|
|
|
continue;
|
1997-04-29 17:08:16 -03:00
|
|
|
len = PyString_Size(v);
|
1997-07-21 11:54:36 -03:00
|
|
|
if (len + 2 + namelen + MAXSUFFIXSIZE >= buflen)
|
1994-09-26 12:47:17 -03:00
|
|
|
continue; /* Too long */
|
1997-04-29 17:08:16 -03:00
|
|
|
strcpy(buf, PyString_AsString(v));
|
2000-06-30 13:18:57 -03:00
|
|
|
if (strlen(buf) != len)
|
1994-09-26 12:47:17 -03:00
|
|
|
continue; /* v contains '\0' */
|
1995-02-15 18:57:06 -04:00
|
|
|
#ifdef macintosh
|
1997-08-12 11:53:39 -03: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 04:33:22 -03:00
|
|
|
if (PyMac_FindResourceModule((PyStringObject *)v, name, buf)) {
|
1997-04-29 17:08:16 -03:00
|
|
|
static struct filedescr resfiledescr =
|
|
|
|
{"", "", PY_RESOURCE};
|
1995-02-15 18:57:06 -04:00
|
|
|
|
|
|
|
return &resfiledescr;
|
|
|
|
}
|
1998-08-06 10:36:01 -03:00
|
|
|
if (PyMac_FindCodeResourceModule((PyStringObject *)v, name, buf)) {
|
|
|
|
static struct filedescr resfiledescr =
|
|
|
|
{"", "", PY_CODERESOURCE};
|
|
|
|
|
|
|
|
return &resfiledescr;
|
|
|
|
}
|
1995-02-15 18:57:06 -04: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 04:33:22 -03:00
|
|
|
if (len > 0 && buf[len-1] != SEP
|
|
|
|
#ifdef ALTSEP
|
|
|
|
&& buf[len-1] != ALTSEP
|
|
|
|
#endif
|
|
|
|
)
|
1995-01-02 15:04:15 -04:00
|
|
|
buf[len++] = SEP;
|
2000-11-13 13:26:32 -04: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 04:33:22 -03:00
|
|
|
#ifdef HAVE_STAT
|
|
|
|
if (stat(buf, &statbuf) == 0) {
|
1997-10-31 14:38:52 -04:00
|
|
|
if (S_ISDIR(statbuf.st_mode)) {
|
1998-02-13 13:18:36 -04:00
|
|
|
if (find_init_module(buf)) {
|
|
|
|
#ifdef CHECK_IMPORT_CASE
|
|
|
|
if (!check_case(buf, len, namelen,
|
|
|
|
name))
|
|
|
|
return NULL;
|
|
|
|
#endif
|
1998-03-04 23:45:08 -04:00
|
|
|
return &fd_package;
|
1998-02-13 13:18:36 -04:00
|
|
|
}
|
1997-10-31 14:38:52 -04: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 04:33:22 -03:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
/* XXX How are you going to test for directories? */
|
|
|
|
#endif
|
1997-10-08 12:25:08 -03:00
|
|
|
#ifdef macintosh
|
|
|
|
fdp = PyMac_FindModuleExtension(buf, &len, name);
|
|
|
|
if (fdp)
|
|
|
|
fp = fopen(buf, fdp->mode);
|
|
|
|
#else
|
1997-04-29 17:08:16 -03:00
|
|
|
for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
|
1995-01-02 15:04:15 -04:00
|
|
|
strcpy(buf+len, fdp->suffix);
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag > 1)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("# trying %s\n", buf);
|
1995-01-02 15:04:15 -04:00
|
|
|
fp = fopen(buf, fdp->mode);
|
1993-11-17 18:58:56 -04:00
|
|
|
if (fp != NULL)
|
|
|
|
break;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1997-08-12 11:53:39 -03:00
|
|
|
#endif /* !macintosh */
|
1993-11-17 18:58:56 -04: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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"No module named %.200s", name);
|
1993-11-17 18:58:56 -04:00
|
|
|
return NULL;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1998-02-13 13:18:36 -04:00
|
|
|
#ifdef CHECK_IMPORT_CASE
|
|
|
|
if (!check_case(buf, len, namelen, name)) {
|
|
|
|
fclose(fp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
1990-10-14 09:07:46 -03:00
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
*p_fp = fp;
|
|
|
|
return fdp;
|
|
|
|
}
|
|
|
|
|
1998-02-13 13:18:36 -04:00
|
|
|
#ifdef CHECK_IMPORT_CASE
|
|
|
|
|
|
|
|
#ifdef MS_WIN32
|
|
|
|
#include <windows.h>
|
1998-06-24 00:54:06 -03:00
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
allcaps8x3(char *s)
|
1998-06-24 00:54:06 -03:00
|
|
|
{
|
|
|
|
/* Return 1 if s is an 8.3 filename in ALLCAPS */
|
|
|
|
char c;
|
|
|
|
char *dot = strchr(s, '.');
|
|
|
|
char *end = strchr(s, '\0');
|
|
|
|
if (dot != NULL) {
|
|
|
|
if (dot-s > 8)
|
2000-05-01 14:36:58 -03:00
|
|
|
return 0; /* More than 8 before '.' */
|
1998-06-24 00:54:06 -03:00
|
|
|
if (end-dot > 4)
|
2000-05-01 14:36:58 -03:00
|
|
|
return 0; /* More than 3 after '.' */
|
1998-06-24 00:54:06 -03:00
|
|
|
end = strchr(dot+1, '.');
|
|
|
|
if (end != NULL)
|
2000-05-01 14:36:58 -03:00
|
|
|
return 0; /* More than one dot */
|
1998-06-24 00:54:06 -03:00
|
|
|
}
|
|
|
|
else if (end-s > 8)
|
2000-05-01 14:36:58 -03:00
|
|
|
return 0; /* More than 8 and no dot */
|
1998-06-24 00:54:06 -03:00
|
|
|
while ((c = *s++)) {
|
|
|
|
if (islower(c))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
1998-02-13 13:18:36 -04:00
|
|
|
static int
|
|
|
|
check_case(char *buf, int len, int namelen, char *name)
|
|
|
|
{
|
|
|
|
WIN32_FIND_DATA data;
|
|
|
|
HANDLE h;
|
|
|
|
if (getenv("PYTHONCASEOK") != NULL)
|
|
|
|
return 1;
|
|
|
|
h = FindFirstFile(buf, &data);
|
|
|
|
if (h == INVALID_HANDLE_VALUE) {
|
|
|
|
PyErr_Format(PyExc_NameError,
|
|
|
|
"Can't find file for module %.100s\n(filename %.300s)",
|
|
|
|
name, buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
FindClose(h);
|
1998-06-24 00:54:06 -03:00
|
|
|
if (allcaps8x3(data.cFileName)) {
|
|
|
|
/* Skip the test if the filename is ALL.CAPS. This can
|
|
|
|
happen in certain circumstances beyond our control,
|
|
|
|
e.g. when software is installed under NT on a FAT
|
|
|
|
filesystem and then the same FAT filesystem is used
|
|
|
|
under Windows 95. */
|
|
|
|
return 1;
|
|
|
|
}
|
1998-02-13 13:18:36 -04:00
|
|
|
if (strncmp(data.cFileName, name, namelen) != 0) {
|
|
|
|
strcpy(buf+len-namelen, data.cFileName);
|
|
|
|
PyErr_Format(PyExc_NameError,
|
|
|
|
"Case mismatch for module name %.100s\n(filename %.300s)",
|
|
|
|
name, buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif /* MS_WIN32 */
|
|
|
|
|
|
|
|
#ifdef macintosh
|
|
|
|
#include <TextUtils.h>
|
2000-04-24 12:08:18 -03:00
|
|
|
#ifdef USE_GUSI1
|
1998-09-14 10:40:53 -03:00
|
|
|
#include "TFileSpec.h" /* for Path2FSSpec() */
|
|
|
|
#endif
|
1998-02-13 13:18:36 -04:00
|
|
|
static int
|
|
|
|
check_case(char *buf, int len, int namelen, char *name)
|
|
|
|
{
|
|
|
|
FSSpec fss;
|
|
|
|
OSErr err;
|
2000-04-24 12:08:18 -03:00
|
|
|
#ifndef USE_GUSI1
|
1998-09-14 10:40:53 -03:00
|
|
|
err = FSMakeFSSpec(0, 0, Pstring(buf), &fss);
|
|
|
|
#else
|
|
|
|
/* GUSI's Path2FSSpec() resolves all possible aliases nicely on
|
|
|
|
the way, which is fine for all directories, but here we need
|
|
|
|
the original name of the alias file (say, Dlg.ppc.slb, not
|
|
|
|
toolboxmodules.ppc.slb). */
|
|
|
|
char *colon;
|
|
|
|
err = Path2FSSpec(buf, &fss);
|
|
|
|
if (err == noErr) {
|
|
|
|
colon = strrchr(buf, ':'); /* find filename */
|
|
|
|
if (colon != NULL)
|
|
|
|
err = FSMakeFSSpec(fss.vRefNum, fss.parID,
|
|
|
|
Pstring(colon+1), &fss);
|
|
|
|
else
|
|
|
|
err = FSMakeFSSpec(fss.vRefNum, fss.parID,
|
|
|
|
fss.name, &fss);
|
|
|
|
}
|
|
|
|
#endif
|
1998-02-13 13:18:36 -04:00
|
|
|
if (err) {
|
|
|
|
PyErr_Format(PyExc_NameError,
|
1998-09-14 10:40:53 -03:00
|
|
|
"Can't find file for module %.100s\n(filename %.300s)",
|
|
|
|
name, buf);
|
1998-02-13 13:18:36 -04:00
|
|
|
return 0;
|
|
|
|
}
|
2000-06-30 22:06:56 -03:00
|
|
|
if ( namelen > fss.name[0] || strncmp(name, (char *)fss.name+1, namelen) != 0 ) {
|
1998-02-13 13:18:36 -04:00
|
|
|
PyErr_Format(PyExc_NameError,
|
1998-09-14 10:40:53 -03:00
|
|
|
"Case mismatch for module name %.100s\n(filename %.300s)",
|
|
|
|
name, fss.name);
|
1998-02-13 13:18:36 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif /* macintosh */
|
|
|
|
|
1998-02-13 19:27:59 -04:00
|
|
|
#ifdef DJGPP
|
1998-02-18 12:21:00 -04:00
|
|
|
#include <dir.h>
|
|
|
|
|
1998-02-13 19:27:59 -04:00
|
|
|
static int
|
|
|
|
check_case(char *buf, int len, int namelen, char *name)
|
|
|
|
{
|
|
|
|
struct ffblk ffblk;
|
|
|
|
int done;
|
|
|
|
|
|
|
|
if (getenv("PYTHONCASEOK") != NULL)
|
|
|
|
return 1;
|
1998-02-18 12:21:00 -04:00
|
|
|
done = findfirst(buf, &ffblk, FA_ARCH|FA_RDONLY|FA_HIDDEN|FA_DIREC);
|
1998-02-13 19:27:59 -04:00
|
|
|
if (done) {
|
|
|
|
PyErr_Format(PyExc_NameError,
|
|
|
|
"Can't find file for module %.100s\n(filename %.300s)",
|
|
|
|
name, buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strncmp(ffblk.ff_name, name, namelen) != 0) {
|
|
|
|
strcpy(buf+len-namelen, ffblk.ff_name);
|
|
|
|
PyErr_Format(PyExc_NameError,
|
|
|
|
"Case mismatch for module name %.100s\n(filename %.300s)",
|
|
|
|
name, buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-04-10 20:44:32 -03:00
|
|
|
#endif /* CHECK_IMPORT_CASE */
|
1998-02-13 13:18:36 -04:00
|
|
|
|
1997-10-31 14:38:52 -04:00
|
|
|
#ifdef HAVE_STAT
|
|
|
|
/* Helper to look for __init__.py or __init__.py[co] in potential package */
|
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
find_init_module(char *buf)
|
1997-10-31 14:38:52 -04:00
|
|
|
{
|
2000-06-30 13:18:57 -03:00
|
|
|
size_t save_len = strlen(buf);
|
|
|
|
size_t i = save_len;
|
1997-10-31 14:38:52 -04:00
|
|
|
struct stat statbuf;
|
|
|
|
|
|
|
|
if (save_len + 13 >= MAXPATHLEN)
|
|
|
|
return 0;
|
|
|
|
buf[i++] = SEP;
|
|
|
|
strcpy(buf+i, "__init__.py");
|
|
|
|
if (stat(buf, &statbuf) == 0) {
|
|
|
|
buf[save_len] = '\0';
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
i += strlen(buf+i);
|
|
|
|
if (Py_OptimizeFlag)
|
|
|
|
strcpy(buf+i, "o");
|
|
|
|
else
|
|
|
|
strcpy(buf+i, "c");
|
|
|
|
if (stat(buf, &statbuf) == 0) {
|
|
|
|
buf[save_len] = '\0';
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
buf[save_len] = '\0';
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* HAVE_STAT */
|
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
|
2000-07-09 00:09:57 -03:00
|
|
|
static int init_builtin(char *); /* Forward */
|
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 04:33:22 -03:00
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
/* Load an external module using the default search path and return
|
1995-01-20 12:53:12 -04:00
|
|
|
its module object WITH INCREMENTED REFERENCE COUNT */
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
load_module(char *name, FILE *fp, char *buf, int type)
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
PyObject *modules;
|
1997-04-29 17:08:16 -03: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 04:33:22 -03:00
|
|
|
int err;
|
1995-01-02 15:04:15 -04: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 04:33:22 -03: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 15:04:15 -04: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 04:33:22 -03:00
|
|
|
switch (type) {
|
1993-11-17 18:58:56 -04:00
|
|
|
|
|
|
|
case PY_SOURCE:
|
1995-01-02 15:04:15 -04:00
|
|
|
m = load_source_module(name, buf, fp);
|
1993-11-17 18:58:56 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PY_COMPILED:
|
1995-01-02 15:04:15 -04:00
|
|
|
m = load_compiled_module(name, buf, fp);
|
1993-11-17 18:58:56 -04:00
|
|
|
break;
|
1993-10-15 10:01:11 -03:00
|
|
|
|
1999-12-22 10:09:35 -04:00
|
|
|
#ifdef HAVE_DYNAMIC_LOADING
|
1993-11-17 18:58:56 -04:00
|
|
|
case C_EXTENSION:
|
1997-04-29 17:08:16 -03:00
|
|
|
m = _PyImport_LoadDynamicModule(name, buf, fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
break;
|
1999-12-22 10:09:35 -04:00
|
|
|
#endif
|
1993-11-17 18:58:56 -04:00
|
|
|
|
1995-02-15 18:57:06 -04:00
|
|
|
#ifdef macintosh
|
|
|
|
case PY_RESOURCE:
|
|
|
|
m = PyMac_LoadResourceModule(name, buf);
|
|
|
|
break;
|
1998-08-06 10:36:01 -03:00
|
|
|
case PY_CODERESOURCE:
|
|
|
|
m = PyMac_LoadCodeResourceModule(name, buf);
|
|
|
|
break;
|
1995-02-15 18:57:06 -04: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 04:33:22 -03:00
|
|
|
case PKG_DIRECTORY:
|
|
|
|
m = load_package(name, buf);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case C_BUILTIN:
|
|
|
|
case PY_FROZEN:
|
1998-03-04 23:45:08 -04:00
|
|
|
if (buf != NULL && buf[0] != '\0')
|
|
|
|
name = buf;
|
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 04:33:22 -03:00
|
|
|
if (type == C_BUILTIN)
|
|
|
|
err = init_builtin(name);
|
|
|
|
else
|
|
|
|
err = PyImport_ImportFrozenModule(name);
|
|
|
|
if (err < 0)
|
1997-09-09 15:53:47 -03: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 04:33:22 -03:00
|
|
|
if (err == 0) {
|
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Purported %s module %.200s not found",
|
|
|
|
type == C_BUILTIN ?
|
|
|
|
"builtin" : "frozen",
|
|
|
|
name);
|
1997-09-09 15:53:47 -03: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 04:33:22 -03:00
|
|
|
}
|
|
|
|
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);
|
1997-09-09 15:53:47 -03: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 04:33:22 -03:00
|
|
|
}
|
|
|
|
Py_INCREF(m);
|
|
|
|
break;
|
|
|
|
|
1993-11-17 18:58:56 -04: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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Don't know how to import %.200s (type code %d)",
|
|
|
|
name, type);
|
1995-01-20 12:53:12 -04:00
|
|
|
m = NULL;
|
1993-11-17 18:58:56 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1993-11-17 18:58:56 -04:00
|
|
|
|
1995-01-02 15:04:15 -04: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
|
2000-07-22 15:47:25 -03:00
|
|
|
init_builtin(char *name)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
1997-08-02 00:10:38 -03:00
|
|
|
struct _inittab *p;
|
|
|
|
PyObject *mod;
|
|
|
|
|
|
|
|
if ((mod = _PyImport_FindExtension(name, name)) != NULL)
|
|
|
|
return 1;
|
|
|
|
|
1997-10-31 14:37:24 -04:00
|
|
|
for (p = PyImport_Inittab; p->name != NULL; p++) {
|
1997-08-02 00:10:38 -03:00
|
|
|
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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"Cannot re-init internal module %.200s",
|
|
|
|
name);
|
1995-01-02 15:04:15 -04:00
|
|
|
return -1;
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("import %s # builtin\n", name);
|
1997-08-02 00:10:38 -03:00
|
|
|
(*p->initfunc)();
|
1997-04-29 17:08:16 -03:00
|
|
|
if (PyErr_Occurred())
|
1995-01-02 15:04:15 -04:00
|
|
|
return -1;
|
1997-08-02 00:10:38 -03:00
|
|
|
if (_PyImport_FixupExtension(name, name) == NULL)
|
|
|
|
return -1;
|
1995-01-02 15:04:15 -04:00
|
|
|
return 1;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1995-01-02 15:04:15 -04:00
|
|
|
return 0;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1995-08-04 01:08:57 -03:00
|
|
|
/* Frozen modules */
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1996-06-17 14:06:34 -03:00
|
|
|
static struct _frozen *
|
2000-07-22 15:47:25 -03:00
|
|
|
find_frozen(char *name)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1996-06-17 14:06:34 -03:00
|
|
|
struct _frozen *p;
|
1995-08-04 01:08:57 -03:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
for (p = PyImport_FrozenModules; ; p++) {
|
1995-01-02 15:04:15 -04:00
|
|
|
if (p->name == NULL)
|
1995-08-04 01:08:57 -03:00
|
|
|
return NULL;
|
1995-01-02 15:04:15 -04:00
|
|
|
if (strcmp(p->name, name) == 0)
|
|
|
|
break;
|
|
|
|
}
|
1995-08-04 01:08:57 -03:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
get_frozen_object(char *name)
|
1995-08-04 01:08:57 -03:00
|
|
|
{
|
1996-06-17 14:06:34 -03:00
|
|
|
struct _frozen *p = find_frozen(name);
|
1998-03-04 23:45:08 -04:00
|
|
|
int size;
|
1995-08-04 01:08:57 -03: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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"No such frozen object named %.200s",
|
|
|
|
name);
|
1995-08-04 01:08:57 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1998-03-04 23:45:08 -04:00
|
|
|
size = p->size;
|
|
|
|
if (size < 0)
|
|
|
|
size = -size;
|
|
|
|
return PyMarshal_ReadObjectFromString((char *)p->code, size);
|
1995-08-04 01:08:57 -03: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
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_ImportFrozenModule(char *name)
|
1995-08-04 01:08:57 -03:00
|
|
|
{
|
1996-06-17 14:06:34 -03:00
|
|
|
struct _frozen *p = find_frozen(name);
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *co;
|
|
|
|
PyObject *m;
|
1998-03-04 23:45:08 -04:00
|
|
|
int ispackage;
|
|
|
|
int size;
|
1995-08-04 01:08:57 -03:00
|
|
|
|
|
|
|
if (p == NULL)
|
|
|
|
return 0;
|
1998-03-04 23:45:08 -04:00
|
|
|
size = p->size;
|
|
|
|
ispackage = (size < 0);
|
|
|
|
if (ispackage)
|
|
|
|
size = -size;
|
1997-04-29 17:08:16 -03:00
|
|
|
if (Py_VerboseFlag)
|
1998-10-12 15:23:55 -03:00
|
|
|
PySys_WriteStderr("import %s # frozen%s\n",
|
1998-03-04 23:45:08 -04:00
|
|
|
name, ispackage ? " package" : "");
|
|
|
|
co = PyMarshal_ReadObjectFromString((char *)p->code, size);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (co == NULL)
|
|
|
|
return -1;
|
1997-04-29 17:08:16 -03: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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"frozen object %.200s is not a code object",
|
|
|
|
name);
|
1995-01-02 15:04:15 -04:00
|
|
|
return -1;
|
|
|
|
}
|
1998-03-04 23:45:08 -04:00
|
|
|
if (ispackage) {
|
|
|
|
/* Set __path__ to the package name */
|
|
|
|
PyObject *d, *s;
|
|
|
|
int err;
|
|
|
|
m = PyImport_AddModule(name);
|
|
|
|
if (m == NULL)
|
|
|
|
return -1;
|
|
|
|
d = PyModule_GetDict(m);
|
|
|
|
s = PyString_InternFromString(name);
|
|
|
|
if (s == NULL)
|
|
|
|
return -1;
|
|
|
|
err = PyDict_SetItemString(d, "__path__", s);
|
|
|
|
Py_DECREF(s);
|
|
|
|
if (err != 0)
|
|
|
|
return err;
|
|
|
|
}
|
1998-02-11 01:53:02 -04:00
|
|
|
m = PyImport_ExecCodeModuleEx(name, co, "<frozen>");
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(co);
|
1995-01-20 12:53:12 -04:00
|
|
|
if (m == NULL)
|
|
|
|
return -1;
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(m);
|
1995-01-20 12:53:12 -04:00
|
|
|
return 1;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
|
|
|
|
/* Import a module, either built-in, frozen, or external, and return
|
1995-01-20 12:53:12 -04:00
|
|
|
its module object WITH INCREMENTED REFERENCE COUNT */
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_ImportModule(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 04:33:22 -03:00
|
|
|
{
|
1997-09-06 15:52:03 -03:00
|
|
|
static PyObject *fromlist = NULL;
|
|
|
|
if (fromlist == NULL && strchr(name, '.') != NULL) {
|
2000-08-27 17:31:27 -03:00
|
|
|
fromlist = Py_BuildValue("(s)", "*");
|
1997-09-06 15:52:03 -03:00
|
|
|
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 04:33:22 -03:00
|
|
|
}
|
|
|
|
|
1997-09-06 15:52:03 -03:00
|
|
|
/* Forward declarations for helper routines */
|
2000-07-09 00:09:57 -03:00
|
|
|
static PyObject *get_parent(PyObject *globals, char *buf, int *p_buflen);
|
|
|
|
static PyObject *load_next(PyObject *mod, PyObject *altmod,
|
|
|
|
char **p_name, char *buf, int *p_buflen);
|
|
|
|
static int mark_miss(char *name);
|
|
|
|
static int ensure_fromlist(PyObject *mod, PyObject *fromlist,
|
|
|
|
char *buf, int buflen, int recursive);
|
|
|
|
static PyObject * import_submodule(PyObject *mod, char *name, char *fullname);
|
1997-09-06 15:52:03 -03:00
|
|
|
|
|
|
|
/* The Magnum Opus of dotted-name import :-) */
|
|
|
|
|
1998-03-03 18:26:50 -04:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
import_module_ex(char *name, PyObject *globals, PyObject *locals,
|
|
|
|
PyObject *fromlist)
|
1997-09-06 15:52:03 -03: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);
|
1997-09-08 13:07:11 -03:00
|
|
|
if (!ensure_fromlist(tail, fromlist, buf, buflen, 0)) {
|
1997-09-06 15:52:03 -03:00
|
|
|
Py_DECREF(tail);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return tail;
|
|
|
|
}
|
|
|
|
|
1998-03-03 18:26:50 -04:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_ImportModuleEx(char *name, PyObject *globals, PyObject *locals,
|
|
|
|
PyObject *fromlist)
|
1998-03-03 18:26:50 -04:00
|
|
|
{
|
|
|
|
PyObject *result;
|
|
|
|
lock_import();
|
1998-03-03 18:33:27 -04:00
|
|
|
result = import_module_ex(name, globals, locals, fromlist);
|
1998-03-03 18:26:50 -04:00
|
|
|
unlock_import();
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
1997-09-06 15:52:03 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
get_parent(PyObject *globals, char *buf, int *p_buflen)
|
1997-09-06 15:52:03 -03:00
|
|
|
{
|
|
|
|
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, '.');
|
2000-06-30 13:18:57 -03:00
|
|
|
size_t len;
|
1997-09-06 15:52:03 -03:00
|
|
|
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? */
|
|
|
|
}
|
|
|
|
|
2000-07-22 15:47:25 -03:00
|
|
|
/* altmod is either None or same as mod */
|
1997-09-06 15:52:03 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
load_next(PyObject *mod, PyObject *altmod, char **p_name, char *buf,
|
|
|
|
int *p_buflen)
|
1997-09-06 15:52:03 -03:00
|
|
|
{
|
|
|
|
char *name = *p_name;
|
|
|
|
char *dot = strchr(name, '.');
|
2000-06-30 13:18:57 -03:00
|
|
|
size_t len;
|
1997-09-06 15:52:03 -03:00
|
|
|
char *p;
|
|
|
|
PyObject *result;
|
|
|
|
|
|
|
|
if (dot == NULL) {
|
|
|
|
*p_name = NULL;
|
|
|
|
len = strlen(name);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*p_name = dot+1;
|
|
|
|
len = dot-name;
|
|
|
|
}
|
1998-04-11 14:38:22 -03:00
|
|
|
if (len == 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Empty module name");
|
|
|
|
return NULL;
|
|
|
|
}
|
1997-09-06 15:52:03 -03:00
|
|
|
|
|
|
|
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);
|
1997-09-06 17:29:52 -03:00
|
|
|
/* Here, altmod must be None and mod must not be None */
|
1997-09-07 03:16:57 -03:00
|
|
|
result = import_submodule(altmod, p, p);
|
1997-09-06 17:29:52 -03:00
|
|
|
if (result != NULL && result != Py_None) {
|
|
|
|
if (mark_miss(buf) != 0) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
strncpy(buf, name, len);
|
|
|
|
buf[len] = '\0';
|
|
|
|
*p_buflen = len;
|
|
|
|
}
|
1997-09-06 15:52:03 -03:00
|
|
|
}
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
1997-09-06 17:29:52 -03:00
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
mark_miss(char *name)
|
1997-09-06 17:29:52 -03:00
|
|
|
{
|
|
|
|
PyObject *modules = PyImport_GetModuleDict();
|
|
|
|
return PyDict_SetItemString(modules, name, Py_None);
|
|
|
|
}
|
|
|
|
|
1997-09-06 15:52:03 -03:00
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
ensure_fromlist(PyObject *mod, PyObject *fromlist, char *buf, int buflen,
|
|
|
|
int recursive)
|
1997-09-06 15:52:03 -03:00
|
|
|
{
|
|
|
|
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] == '*') {
|
1997-09-08 13:07:11 -03:00
|
|
|
PyObject *all;
|
1997-09-06 15:52:03 -03:00
|
|
|
Py_DECREF(item);
|
1997-09-08 13:07:11 -03:00
|
|
|
/* See if the package defines __all__ */
|
|
|
|
if (recursive)
|
|
|
|
continue; /* Avoid endless recursion */
|
|
|
|
all = PyObject_GetAttrString(mod, "__all__");
|
|
|
|
if (all == NULL)
|
|
|
|
PyErr_Clear();
|
|
|
|
else {
|
|
|
|
if (!ensure_fromlist(mod, all, buf, buflen, 1))
|
|
|
|
return 0;
|
|
|
|
Py_DECREF(all);
|
|
|
|
}
|
1997-09-06 15:52:03 -03:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
1997-10-03 12:33:32 -03:00
|
|
|
/* NOTREACHED */
|
1997-09-06 15:52:03 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
import_submodule(PyObject *mod, char *subname, char *fullname)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-08-02 00:10:38 -03:00
|
|
|
PyObject *modules = PyImport_GetModuleDict();
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *m;
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-09-06 15:52:03 -03:00
|
|
|
/* Require:
|
|
|
|
if mod == None: subname == fullname
|
|
|
|
else: mod.__name__ + "." + subname == fullname
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ((m = PyDict_GetItemString(modules, fullname)) != NULL) {
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_INCREF(m);
|
1995-01-20 12:53:12 -04:00
|
|
|
}
|
|
|
|
else {
|
1997-09-06 15:52:03 -03: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 04:33:22 -03:00
|
|
|
char buf[MAXPATHLEN+1];
|
|
|
|
struct filedescr *fdp;
|
|
|
|
FILE *fp = NULL;
|
|
|
|
|
1998-05-19 12:09:05 -03:00
|
|
|
if (mod == Py_None)
|
|
|
|
path = NULL;
|
|
|
|
else {
|
|
|
|
path = PyObject_GetAttrString(mod, "__path__");
|
|
|
|
if (path == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
|
|
|
}
|
|
|
|
}
|
1997-09-06 15:52:03 -03: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 04:33:22 -03:00
|
|
|
buf[0] = '\0';
|
1998-07-01 14:36:26 -03:00
|
|
|
fdp = find_module(subname, path, buf, MAXPATHLEN+1, &fp);
|
|
|
|
Py_XDECREF(path);
|
1997-09-06 15:52:03 -03: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 04:33:22 -03:00
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
1997-09-06 15:52:03 -03:00
|
|
|
if (m != NULL && mod != Py_None) {
|
|
|
|
if (PyObject_SetAttrString(mod, subname, m) < 0) {
|
|
|
|
Py_DECREF(m);
|
|
|
|
m = NULL;
|
|
|
|
}
|
|
|
|
}
|
1991-02-19 08:23:57 -04:00
|
|
|
}
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
return m;
|
|
|
|
}
|
1990-10-26 11:58:58 -03:00
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
|
|
|
|
/* Re-import a module of any kind and return its module object, WITH
|
|
|
|
INCREMENTED REFERENCE COUNT */
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_ReloadModule(PyObject *m)
|
1990-10-26 11:58:58 -03:00
|
|
|
{
|
1997-08-02 00:10:38 -03:00
|
|
|
PyObject *modules = PyImport_GetModuleDict();
|
1997-09-06 16:41:09 -03: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 04:33:22 -03:00
|
|
|
char buf[MAXPATHLEN+1];
|
|
|
|
struct filedescr *fdp;
|
|
|
|
FILE *fp = NULL;
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
if (m == NULL || !PyModule_Check(m)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"reload() argument must be module");
|
1990-10-26 11:58:58 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
name = PyModule_GetName(m);
|
1993-11-17 18:58:56 -04:00
|
|
|
if (name == NULL)
|
|
|
|
return NULL;
|
1997-08-02 00:10:38 -03: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 04:33:22 -03:00
|
|
|
PyErr_Format(PyExc_ImportError,
|
|
|
|
"reload(): module %.200s not in sys.modules",
|
|
|
|
name);
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
1994-08-29 09:54:38 -03:00
|
|
|
}
|
1997-09-06 16:41:09 -03: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);
|
1999-01-27 13:54:20 -04:00
|
|
|
Py_DECREF(parentname);
|
1997-09-06 16:41:09 -03:00
|
|
|
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 04:33:22 -03:00
|
|
|
buf[0] = '\0';
|
1997-09-06 16:41:09 -03: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 04:33:22 -03:00
|
|
|
if (fdp == NULL)
|
|
|
|
return NULL;
|
|
|
|
m = load_module(name, fp, buf, fdp->type);
|
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
return m;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-08-14 17:11:26 -03: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
|
1998-12-21 15:51:00 -04:00
|
|
|
environment, e.g. by "rexec".
|
|
|
|
A dummy list ["__doc__"] is passed as the 4th argument so that
|
|
|
|
e.g. PyImport_Import(PyString_FromString("win32com.client.gencache"))
|
|
|
|
will return <module "gencache"> instead of <module "win32com">. */
|
1997-08-14 17:11:26 -03:00
|
|
|
|
|
|
|
PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_Import(PyObject *module_name)
|
1997-08-14 17:11:26 -03:00
|
|
|
{
|
|
|
|
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) {
|
1998-10-22 12:46:50 -03:00
|
|
|
Py_INCREF(globals);
|
1997-08-14 17:11:26 -03:00
|
|
|
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 15:04:15 -04:00
|
|
|
/* Module 'imp' provides Python access to the primitives used for
|
|
|
|
importing modules.
|
|
|
|
*/
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_get_magic(PyObject *self, PyObject *args)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1995-01-02 15:04:15 -04:00
|
|
|
char buf[4];
|
|
|
|
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, ":get_magic"))
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
2000-05-01 17:19:08 -03:00
|
|
|
buf[0] = (char) ((pyc_magic >> 0) & 0xff);
|
|
|
|
buf[1] = (char) ((pyc_magic >> 8) & 0xff);
|
|
|
|
buf[2] = (char) ((pyc_magic >> 16) & 0xff);
|
|
|
|
buf[3] = (char) ((pyc_magic >> 24) & 0xff);
|
1995-01-02 15:04:15 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
return PyString_FromStringAndSize(buf, 4);
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_get_suffixes(PyObject *self, PyObject *args)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *list;
|
1995-01-02 15:04:15 -04:00
|
|
|
struct filedescr *fdp;
|
|
|
|
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, ":get_suffixes"))
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
list = PyList_New(0);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (list == NULL)
|
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
|
|
|
|
PyObject *item = Py_BuildValue("ssi",
|
1995-01-02 15:04:15 -04:00
|
|
|
fdp->suffix, fdp->mode, fdp->type);
|
|
|
|
if (item == NULL) {
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(list);
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
if (PyList_Append(list, item) < 0) {
|
|
|
|
Py_DECREF(list);
|
|
|
|
Py_DECREF(item);
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(item);
|
1990-10-26 11:58:58 -03:00
|
|
|
}
|
1995-01-02 15:04:15 -04:00
|
|
|
return list;
|
1990-10-26 11:58:58 -03:00
|
|
|
}
|
1991-02-19 08:23:57 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
call_find_module(char *name, PyObject *path)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
2000-07-09 00:09:57 -03:00
|
|
|
extern int fclose(FILE *);
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *fob, *ret;
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
FILE *fp = NULL;
|
|
|
|
|
|
|
|
pathname[0] = '\0';
|
1997-09-06 15:52:03 -03:00
|
|
|
if (path == Py_None)
|
|
|
|
path = NULL;
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
if (fp != NULL) {
|
|
|
|
fob = PyFile_FromFile(fp, pathname, fdp->mode, fclose);
|
|
|
|
if (fob == NULL) {
|
|
|
|
fclose(fp);
|
|
|
|
return NULL;
|
|
|
|
}
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
else {
|
|
|
|
fob = Py_None;
|
|
|
|
Py_INCREF(fob);
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
ret = Py_BuildValue("Os(ssi)",
|
1995-01-02 15:04:15 -04:00
|
|
|
fob, pathname, fdp->suffix, fdp->mode, fdp->type);
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_DECREF(fob);
|
1995-01-02 15:04:15 -04:00
|
|
|
return ret;
|
|
|
|
}
|
1991-02-19 08:23:57 -04: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 04:33:22 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_find_module(PyObject *self, PyObject *args)
|
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 04:33:22 -03:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
PyObject *path = NULL;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "s|O: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 04:33:22 -03:00
|
|
|
return NULL;
|
|
|
|
return call_find_module(name, path);
|
|
|
|
}
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_init_builtin(PyObject *self, PyObject *args)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
int ret;
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *m;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "s:init_builtin", &name))
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
|
|
|
ret = init_builtin(name);
|
|
|
|
if (ret < 0)
|
|
|
|
return NULL;
|
|
|
|
if (ret == 0) {
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
m = PyImport_AddModule(name);
|
|
|
|
Py_XINCREF(m);
|
1995-01-02 15:04:15 -04:00
|
|
|
return m;
|
|
|
|
}
|
1991-02-19 08:23:57 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_init_frozen(PyObject *self, PyObject *args)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
1991-02-19 08:23:57 -04:00
|
|
|
char *name;
|
1995-01-02 15:04:15 -04:00
|
|
|
int ret;
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *m;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "s:init_frozen", &name))
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
ret = PyImport_ImportFrozenModule(name);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (ret < 0)
|
|
|
|
return NULL;
|
|
|
|
if (ret == 0) {
|
1997-04-29 17:08:16 -03:00
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
m = PyImport_AddModule(name);
|
|
|
|
Py_XINCREF(m);
|
1995-01-02 15:04:15 -04:00
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_get_frozen_object(PyObject *self, PyObject *args)
|
1995-08-04 01:08:57 -03:00
|
|
|
{
|
|
|
|
char *name;
|
1995-10-03 11:38:41 -03:00
|
|
|
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "s:get_frozen_object", &name))
|
1995-08-04 01:08:57 -03:00
|
|
|
return NULL;
|
|
|
|
return get_frozen_object(name);
|
|
|
|
}
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_is_builtin(PyObject *self, PyObject *args)
|
1991-02-19 08:23:57 -04:00
|
|
|
{
|
1995-01-02 15:04:15 -04:00
|
|
|
char *name;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "s:is_builtin", &name))
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
return PyInt_FromLong(is_builtin(name));
|
1991-02-19 08:23:57 -04:00
|
|
|
}
|
1993-04-01 16:59:32 -04:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_is_frozen(PyObject *self, PyObject *args)
|
1993-04-01 16:59:32 -04:00
|
|
|
{
|
1995-01-02 15:04:15 -04:00
|
|
|
char *name;
|
1998-06-24 00:54:06 -03:00
|
|
|
struct _frozen *p;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "s:is_frozen", &name))
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
1998-06-24 00:54:06 -03:00
|
|
|
p = find_frozen(name);
|
|
|
|
return PyInt_FromLong((long) (p == NULL ? 0 : p->size));
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static FILE *
|
2000-07-22 15:47:25 -03:00
|
|
|
get_file(char *pathname, PyObject *fob, char *mode)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
if (fob == NULL) {
|
|
|
|
fp = fopen(pathname, mode);
|
|
|
|
if (fp == NULL)
|
1997-04-29 17:08:16 -03:00
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
1993-04-01 16:59:32 -04:00
|
|
|
}
|
1995-01-02 15:04:15 -04:00
|
|
|
else {
|
1997-04-29 17:08:16 -03:00
|
|
|
fp = PyFile_AsFile(fob);
|
1995-01-02 15:04:15 -04:00
|
|
|
if (fp == NULL)
|
1997-04-29 17:08:16 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"bad/closed file object");
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
|
|
|
return fp;
|
1993-04-01 16:59:32 -04:00
|
|
|
}
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_load_compiled(PyObject *self, PyObject *args)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *fob = NULL;
|
|
|
|
PyObject *m;
|
1995-01-02 15:04:15 -04:00
|
|
|
FILE *fp;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "ss|O!:load_compiled", &name, &pathname,
|
1997-04-29 17:08:16 -03:00
|
|
|
&PyFile_Type, &fob))
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
if (fob == NULL)
|
|
|
|
fclose(fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
return m;
|
|
|
|
}
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1999-12-22 10:09:35 -04:00
|
|
|
#ifdef HAVE_DYNAMIC_LOADING
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_load_dynamic(PyObject *self, PyObject *args)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *fob = NULL;
|
|
|
|
PyObject *m;
|
1995-07-07 19:50:36 -03:00
|
|
|
FILE *fp = NULL;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "ss|O!:load_dynamic", &name, &pathname,
|
1997-04-29 17:08:16 -03:00
|
|
|
&PyFile_Type, &fob))
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
if (fob) {
|
1995-07-07 19:50:36 -03: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 04:33:22 -03:00
|
|
|
if (fp == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 17:08:16 -03:00
|
|
|
m = _PyImport_LoadDynamicModule(name, pathname, fp);
|
1995-07-07 19:50:36 -03:00
|
|
|
return m;
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1999-12-22 10:09:35 -04:00
|
|
|
#endif /* HAVE_DYNAMIC_LOADING */
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_load_source(PyObject *self, PyObject *args)
|
1995-01-02 15:04:15 -04:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *fob = NULL;
|
|
|
|
PyObject *m;
|
1995-01-02 15:04:15 -04:00
|
|
|
FILE *fp;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "ss|O!:load_source", &name, &pathname,
|
1997-04-29 17:08:16 -03:00
|
|
|
&PyFile_Type, &fob))
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
if (fob == NULL)
|
|
|
|
fclose(fp);
|
1995-01-02 15:04:15 -04:00
|
|
|
return m;
|
|
|
|
}
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1995-02-15 18:57:06 -04:00
|
|
|
#ifdef macintosh
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_load_resource(PyObject *self, PyObject *args)
|
1995-02-15 18:57:06 -04:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
1997-04-29 17:08:16 -03:00
|
|
|
PyObject *m;
|
1995-02-15 18:57:06 -04:00
|
|
|
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "ss:load_resource", &name, &pathname))
|
1995-02-15 18:57:06 -04: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 04:33:22 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_load_module(PyObject *self, PyObject *args)
|
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 04:33:22 -03:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
PyObject *fob;
|
|
|
|
char *pathname;
|
|
|
|
char *suffix; /* Unused */
|
|
|
|
char *mode;
|
|
|
|
int type;
|
|
|
|
FILE *fp;
|
|
|
|
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "sOs(ssi):load_module",
|
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 04:33:22 -03:00
|
|
|
&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 *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_load_package(PyObject *self, PyObject *args)
|
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 04:33:22 -03:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *pathname;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "ss:load_package", &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 04:33:22 -03:00
|
|
|
return NULL;
|
|
|
|
return load_package(name, pathname);
|
|
|
|
}
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyObject *
|
2000-07-22 15:47:25 -03:00
|
|
|
imp_new_module(PyObject *self, PyObject *args)
|
1994-08-29 09:54:38 -03:00
|
|
|
{
|
1995-01-02 15:04:15 -04:00
|
|
|
char *name;
|
2000-02-29 09:59:29 -04:00
|
|
|
if (!PyArg_ParseTuple(args, "s:new_module", &name))
|
1995-01-02 15:04:15 -04:00
|
|
|
return NULL;
|
1997-04-29 17:08:16 -03:00
|
|
|
return PyModule_New(name);
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1997-09-09 19:04:42 -03:00
|
|
|
/* Doc strings */
|
|
|
|
|
|
|
|
static char doc_imp[] = "\
|
|
|
|
This module provides the components needed to build your own\n\
|
|
|
|
__import__ function. Undocumented functions are obsolete.\n\
|
|
|
|
";
|
|
|
|
|
|
|
|
static char doc_find_module[] = "\
|
|
|
|
find_module(name, [path]) -> (file, filename, (suffix, mode, type))\n\
|
|
|
|
Search for a module. If path is omitted or None, search for a\n\
|
|
|
|
built-in, frozen or special module and continue search in sys.path.\n\
|
|
|
|
The module name cannot contain '.'; to search for a submodule of a\n\
|
|
|
|
package, pass the submodule name and the package's __path__.\
|
|
|
|
";
|
|
|
|
|
|
|
|
static char doc_load_module[] = "\
|
|
|
|
load_module(name, file, filename, (suffix, mode, type)) -> module\n\
|
|
|
|
Load a module, given information returned by find_module().\n\
|
|
|
|
The module name must include the full package name, if any.\
|
|
|
|
";
|
|
|
|
|
|
|
|
static char doc_get_magic[] = "\
|
|
|
|
get_magic() -> string\n\
|
|
|
|
Return the magic number for .pyc or .pyo files.\
|
|
|
|
";
|
|
|
|
|
|
|
|
static char doc_get_suffixes[] = "\
|
|
|
|
get_suffixes() -> [(suffix, mode, type), ...]\n\
|
|
|
|
Return a list of (suffix, mode, type) tuples describing the files\n\
|
|
|
|
that find_module() looks for.\
|
|
|
|
";
|
|
|
|
|
|
|
|
static char doc_new_module[] = "\
|
|
|
|
new_module(name) -> module\n\
|
|
|
|
Create a new module. Do not enter it in sys.modules.\n\
|
|
|
|
The module name must include the full package name, if any.\
|
|
|
|
";
|
|
|
|
|
1997-04-29 17:08:16 -03:00
|
|
|
static PyMethodDef imp_methods[] = {
|
1997-09-09 19:04:42 -03:00
|
|
|
{"find_module", imp_find_module, 1, doc_find_module},
|
|
|
|
{"get_magic", imp_get_magic, 1, doc_get_magic},
|
|
|
|
{"get_suffixes", imp_get_suffixes, 1, doc_get_suffixes},
|
|
|
|
{"load_module", imp_load_module, 1, doc_load_module},
|
|
|
|
{"new_module", imp_new_module, 1, doc_new_module},
|
|
|
|
/* The rest are obsolete */
|
1995-08-04 01:08:57 -03:00
|
|
|
{"get_frozen_object", imp_get_frozen_object, 1},
|
1995-01-02 15:04:15 -04:00
|
|
|
{"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},
|
1999-12-22 10:09:35 -04:00
|
|
|
#ifdef HAVE_DYNAMIC_LOADING
|
1995-01-02 15:04:15 -04:00
|
|
|
{"load_dynamic", imp_load_dynamic, 1},
|
1999-12-22 10:09:35 -04: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 04:33:22 -03:00
|
|
|
{"load_package", imp_load_package, 1},
|
1995-02-15 18:57:06 -04: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 04:33:22 -03:00
|
|
|
{"load_source", imp_load_source, 1},
|
1995-01-02 15:04:15 -04:00
|
|
|
{NULL, NULL} /* sentinel */
|
|
|
|
};
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1998-08-04 19:46:29 -03:00
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
setint(PyObject *d, char *name, int value)
|
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 04:33:22 -03:00
|
|
|
{
|
|
|
|
PyObject *v;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
v = PyInt_FromLong((long)value);
|
|
|
|
err = PyDict_SetItemString(d, name, v);
|
|
|
|
Py_XDECREF(v);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
1995-01-02 15:04:15 -04:00
|
|
|
void
|
2000-07-22 15:47:25 -03:00
|
|
|
initimp(void)
|
1995-01-02 15:04:15 -04: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 04:33:22 -03:00
|
|
|
PyObject *m, *d;
|
1994-08-29 09:54:38 -03:00
|
|
|
|
1997-09-09 19:04:42 -03:00
|
|
|
m = Py_InitModule4("imp", imp_methods, doc_imp,
|
|
|
|
NULL, PYTHON_API_VERSION);
|
1997-04-29 17:08:16 -03:00
|
|
|
d = PyModule_GetDict(m);
|
1994-08-29 09:54:38 -03: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 04:33:22 -03: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;
|
1998-08-06 10:36:01 -03:00
|
|
|
if (setint(d, "PY_CODERESOURCE", PY_CODERESOURCE) < 0) goto failure;
|
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 04:33:22 -03:00
|
|
|
|
|
|
|
failure:
|
|
|
|
;
|
1995-01-02 15:04:15 -04:00
|
|
|
}
|
1998-05-13 23:32:54 -03:00
|
|
|
|
|
|
|
|
2000-05-03 20:44:39 -03:00
|
|
|
/* API for embedding applications that want to add their own entries
|
|
|
|
to the table of built-in modules. This should normally be called
|
|
|
|
*before* Py_Initialize(). When the table resize fails, -1 is
|
|
|
|
returned and the existing table is unchanged.
|
1998-05-13 23:32:54 -03:00
|
|
|
|
|
|
|
After a similar function by Just van Rossum. */
|
|
|
|
|
|
|
|
int
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_ExtendInittab(struct _inittab *newtab)
|
1998-05-13 23:32:54 -03:00
|
|
|
{
|
|
|
|
static struct _inittab *our_copy = NULL;
|
|
|
|
struct _inittab *p;
|
|
|
|
int i, n;
|
|
|
|
|
|
|
|
/* Count the number of entries in both tables */
|
|
|
|
for (n = 0; newtab[n].name != NULL; n++)
|
|
|
|
;
|
|
|
|
if (n == 0)
|
|
|
|
return 0; /* Nothing to do */
|
|
|
|
for (i = 0; PyImport_Inittab[i].name != NULL; i++)
|
|
|
|
;
|
|
|
|
|
|
|
|
/* Allocate new memory for the combined table */
|
2000-05-03 20:44:39 -03:00
|
|
|
p = our_copy;
|
|
|
|
PyMem_RESIZE(p, struct _inittab, i+n+1);
|
1998-05-13 23:32:54 -03:00
|
|
|
if (p == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Copy the tables into the new memory */
|
|
|
|
if (our_copy != PyImport_Inittab)
|
|
|
|
memcpy(p, PyImport_Inittab, (i+1) * sizeof(struct _inittab));
|
|
|
|
PyImport_Inittab = our_copy = p;
|
|
|
|
memcpy(p+i, newtab, (n+1) * sizeof(struct _inittab));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Shorthand to add a single entry given a name and a function */
|
|
|
|
|
|
|
|
int
|
2000-07-22 15:47:25 -03:00
|
|
|
PyImport_AppendInittab(char *name, void (*initfunc)(void))
|
1998-05-13 23:32:54 -03:00
|
|
|
{
|
|
|
|
struct _inittab newtab[2];
|
|
|
|
|
|
|
|
memset(newtab, '\0', sizeof newtab);
|
|
|
|
|
|
|
|
newtab[0].name = name;
|
|
|
|
newtab[0].initfunc = initfunc;
|
|
|
|
|
|
|
|
return PyImport_ExtendInittab(newtab);
|
|
|
|
}
|