Replace the run-time 'future-bytecode-stream-inspection' hack to find out

how 'import' was called with a compiletime mechanism: create either a tuple
of the import arguments, or None (in the case of a normal import), add it to
the code-block constants, and load it onto the stack before calling
IMPORT_NAME.
This commit is contained in:
Thomas Wouters 2000-08-27 20:31:27 +00:00
parent e868211e10
commit dd13e4f91f
3 changed files with 19 additions and 59 deletions

View file

@ -66,7 +66,7 @@ extern time_t PyOS_GetLastModificationTime(char *, FILE *);
/* XXX Perhaps the magic number should be frozen and a version field
added to the .pyc file header? */
/* New way to come up with the magic number: (YEAR-1995), MONTH, DAY */
#define MAGIC (50822 | ((long)'\r'<<16) | ((long)'\n'<<24))
#define MAGIC (50823 | ((long)'\r'<<16) | ((long)'\n'<<24))
/* Magic word as global; note that _PyImport_Init() can change the
value of this global to accommodate for alterations of how the
@ -1401,7 +1401,7 @@ PyImport_ImportModule(char *name)
{
static PyObject *fromlist = NULL;
if (fromlist == NULL && strchr(name, '.') != NULL) {
fromlist = Py_BuildValue("[s]", "*");
fromlist = Py_BuildValue("(s)", "*");
if (fromlist == NULL)
return NULL;
}