traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

On the macintosh don't take a quick exit in find_module() for frozen submodule imports: the frozen import goes through a different mechanism.

This commit is contained in:
Jack Jansen 2001-10-30 13:08:39 +00:00
parent 99de218cfc
commit 550fdae2f5
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Python/import.c
View File

@ -893,6 +893,13 @@ find_module(char *realname, PyObject *path, char *buf, size_t buflen,
strcat(buf, "."); strcat(buf, ".");
strcat(buf, name); strcat(buf, name);
strcpy(name, buf); strcpy(name, buf);
#ifdef macintosh
/* Freezing on the mac works different, and the modules are
** actually on sys.path. So we don't take the quick exit but
** continue with the normal flow.
*/
path = NULL;
#else
if (find_frozen(name) != NULL) { if (find_frozen(name) != NULL) {
strcpy(buf, name); strcpy(buf, name);
return &fd_frozen; return &fd_frozen;
@ -900,6 +907,7 @@ find_module(char *realname, PyObject *path, char *buf, size_t buflen,
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"No frozen submodule named %.200s", name); "No frozen submodule named %.200s", name);
return NULL; return NULL;
#endif
} }
if (path == NULL) { if (path == NULL) {
if (is_builtin(name)) { if (is_builtin(name)) {