PublicArchive/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-05-18 10:24:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Patch #703779: unset __file__ in __main__ after running a file. This

Browse Source 
makes the filenames the warning module prints much more sensible when
a PYTHONSTARTUP file is used.
This commit is contained in:
Georg Brandl
2007-03-07 00:40:28 +00:00
parent 49aafc9f2c
commit aa2321b0f8
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Python/pythonrun.c
+11 -3
View File
@@ -849,6 +849,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
{
PyObject *m, *d, *v;
const char *ext;
int set_file_name = 0, ret;
m = PyImport_AddModule("__main__");
if (m == NULL)
@@ -862,6 +863,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
Py_DECREF(f);
return -1;
}
set_file_name = 1;
Py_DECREF(f);
}
ext = filename + strlen(filename) - 4;
@@ -871,7 +873,8 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
fclose(fp);
if ((fp = fopen(filename, "rb")) == NULL) {
fprintf(stderr, "python: Can't reopen .pyc file\n");
return -1;
ret = -1;
goto done;
}
/* Turn on optimization if a .pyo file is given */
if (strcmp(ext, ".pyo") == 0)
@@ -883,12 +886,17 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
}
if (v == NULL) {
PyErr_Print();
return -1;
ret = -1;
goto done;
}
Py_DECREF(v);
if (Py_FlushLine())
PyErr_Clear();
return 0;
ret = 0;
done:
if (set_file_name && PyDict_DelItemString(d, "__file__"))
PyErr_Clear();
return ret;
}
int