mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(),

Browse source 
PyRun_FileEx().  These are the same as their non-Ex counterparts but
have an extra argument, a flag telling them to close the file when
done.

Then this is used by Py_Main() and execfile() to close the file after
it is parsed but before it is executed.

Adding APIs seems strange given the feature freeze but it's the only
way I see to close the bug report without incompatible changes.

[ Bug #110616 ] source file stays open after parsing is done (PR#209)
This commit is contained in:
Guido van Rossum 2000-08-27 19:21:52 +00:00
parent 2f15b25da2
commit 0df002c45b
4 changed files with 41 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Python/pythonrun.c
View file

@ -449,13 +449,23 @@ initsite(void)
int
PyRun_AnyFile(FILE *fp, char *filename)
{
return PyRun_AnyFileEx(fp, filename, 0);
}
int
PyRun_AnyFileEx(FILE *fp, char *filename, int closeit)
{
if (filename == NULL)
filename = "???";
if (Py_FdIsInteractive(fp, filename))
return PyRun_InteractiveLoop(fp, filename);
if (Py_FdIsInteractive(fp, filename)) {
int err = PyRun_InteractiveLoop(fp, filename);
if (closeit)
fclose(fp);
return err;
}
else
return PyRun_SimpleFile(fp, filename);
return PyRun_SimpleFileEx(fp, filename, closeit);
}
int
@ -541,6 +551,12 @@ PyRun_InteractiveOne(FILE *fp, char *filename)
int
PyRun_SimpleFile(FILE *fp, char *filename)
{
return PyRun_SimpleFileEx(fp, filename, 0);
}
int
PyRun_SimpleFileEx(FILE *fp, char *filename, int closeit)
{
PyObject *m, *d, *v;
char *ext;
@ -558,7 +574,8 @@ PyRun_SimpleFile(FILE *fp, char *filename)
#endif /* macintosh */
) {
/* Try to run a pyc file. First, re-open in binary */
/* Don't close, done in main: fclose(fp); */
if (closeit)
fclose(fp);
if( (fp = fopen(filename, "rb")) == NULL ) {
fprintf(stderr, "python: Can't reopen .pyc file\n");
return -1;
@ -568,7 +585,7 @@ PyRun_SimpleFile(FILE *fp, char *filename)
Py_OptimizeFlag = 1;
v = run_pyc_file(fp, filename, d, d);
} else {
v = PyRun_File(fp, filename, Py_file_input, d, d);
v = PyRun_FileEx(fp, filename, Py_file_input, d, d, closeit);
}
if (v == NULL) {
PyErr_Print();
@ -845,8 +862,17 @@ PyObject *
PyRun_File(FILE *fp, char *filename, int start, PyObject *globals,
PyObject *locals)
{
return run_err_node(PyParser_SimpleParseFile(fp, filename, start),
filename, globals, locals);
PyRun_FileEx(fp, filename, start, globals, locals, 0);
}
PyObject *
PyRun_FileEx(FILE *fp, char *filename, int start, PyObject *globals,
PyObject *locals, int closeit)
{
node *n = PyParser_SimpleParseFile(fp, filename, start);
if (closeit)
fclose(fp);
return run_err_node(n, filename, globals, locals);
}
static PyObject *