mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

import.c: When something is wrong with the .pyc, properly open the .py

Browse source 
file.
object.c: Write allocation statistics to stderr.
This commit is contained in:
Sjoerd Mullender 1993-10-25 08:40:52 +00:00
parent 89b3325dc4
commit 52c1f51554
2 changed files with 40 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Python/import.c
View file

@ -228,7 +228,6 @@ get_module(m, name, m_ret)
pyc_mtime = rd_long(fpc);
if (mtime != -1 && mtime > pyc_mtime) {
fclose(fpc);
fp = fopen(namebuf, "rb");
goto read_py;
}
if (magic == MAGIC) {
@ -247,40 +246,46 @@ get_module(m, name, m_ret)
fprintf(stderr,
"import %s # precompiled from \"%s\"\n",
name, namebuf);
else
else {
fprintf(stderr,
"# invalid precompiled file \"%s\"\n",
namebuf);
}
}
else if ((fp = find_module(name, PY_SUFFIX, "r",
namebuf, &mtime)) != NULL) {
read_py:
namelen = strlen(namebuf);
if (co == NULL) {
if (verbose)
fprintf(stderr,
"import %s # from \"%s\"\n",
name, namebuf);
err = parse_file(fp, namebuf, file_input, &n);
} else
err = E_DONE;
fclose(fp);
if (err != E_DONE) {
err_input(err);
return NULL;
goto read_py;
}
}
}
else {
if (m == NULL) {
sprintf(namebuf, "no module named %.200s", name);
err_setstr(ImportError, namebuf);
read_py:
if ((fp = find_module(name, PY_SUFFIX, "r",
namebuf, &mtime)) != NULL) {
namelen = strlen(namebuf);
if (co == NULL) {
if (verbose)
fprintf(stderr,
"import %s # from \"%s\"\n",
name, namebuf);
err = parse_file(fp, namebuf, file_input, &n);
} else
err = E_DONE;
fclose(fp);
if (err != E_DONE) {
err_input(err);
return NULL;
}
}
else {
sprintf(namebuf, "no source for module %.200s", name);
err_setstr(ImportError, namebuf);
if (m == NULL) {
sprintf(namebuf, "no module named %.200s",
name);
err_setstr(ImportError, namebuf);
}
else {
sprintf(namebuf, "no source for module %.200s",
name);
err_setstr(ImportError, namebuf);
}
return NULL;
}
return NULL;
}
if (m == NULL) {
m = add_module(name);