[Python-checkins] CVS: python/dist/src/Include pythonrun.h,2.33,2.34

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28955

Modified Files:
	pythonrun.h 
Log Message:
Add three new APIs: PyRun_AnyFileEx(), PyRun_SimpleFileEx(),
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)


Index: pythonrun.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pythonrun.h,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** pythonrun.h	2000/08/27 19:15:30	2.33
--- pythonrun.h	2000/08/27 19:19:26	2.34
***************
*** 30,36 ****
--- 30,38 ----
  
  DL_IMPORT(int) PyRun_AnyFile(FILE *, char *);
+ DL_IMPORT(int) PyRun_AnyFileEx(FILE *, char *, int);
  
  DL_IMPORT(int) PyRun_SimpleString(char *);
  DL_IMPORT(int) PyRun_SimpleFile(FILE *, char *);
+ DL_IMPORT(int) PyRun_SimpleFileEx(FILE *, char *, int);
  DL_IMPORT(int) PyRun_InteractiveOne(FILE *, char *);
  DL_IMPORT(int) PyRun_InteractiveLoop(FILE *, char *);
***************
*** 41,44 ****
--- 43,48 ----
  DL_IMPORT(PyObject *) PyRun_String(char *, int, PyObject *, PyObject *);
  DL_IMPORT(PyObject *) PyRun_File(FILE *, char *, int, PyObject *, PyObject *);
+ DL_IMPORT(PyObject *) PyRun_FileEx(FILE *, char *, int,
+ 				   PyObject *, PyObject *, int);
  
  DL_IMPORT(PyObject *) Py_CompileString(char *, char *, int);