summaryrefslogtreecommitdiff
path: root/Python/importdl.h
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-09-05 07:33:22 +0000
committerGuido van Rossum <guido@python.org>1997-09-05 07:33:22 +0000
commitaee0bad0a50f9f533267d241bea97a0b2118f238 (patch)
tree636ee14fc00351167bfea4c341ada498730f1cc2 /Python/importdl.h
parent026de19906695cc0f63977da4e7740214048ba6f (diff)
downloadcpython-git-aee0bad0a50f9f533267d241bea97a0b2118f238.tar.gz
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!
Diffstat (limited to 'Python/importdl.h')
-rw-r--r--Python/importdl.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/Python/importdl.h b/Python/importdl.h
index 4587841d1c..fb50ded67b 100644
--- a/Python/importdl.h
+++ b/Python/importdl.h
@@ -30,11 +30,16 @@ PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
/* Definitions for dynamic loading of extension modules */
-#ifdef macintosh
-enum filetype {SEARCH_ERROR, PY_SOURCE, PY_COMPILED, C_EXTENSION, PY_RESOURCE};
-#else
-enum filetype {SEARCH_ERROR, PY_SOURCE, PY_COMPILED, C_EXTENSION};
-#endif
+enum filetype {
+ SEARCH_ERROR,
+ PY_SOURCE,
+ PY_COMPILED,
+ C_EXTENSION,
+ PY_RESOURCE, /* Mac only */
+ PKG_DIRECTORY,
+ C_BUILTIN,
+ PY_FROZEN
+};
extern struct filedescr {
char *suffix;