Backport #1442: report exception when startup file cannot be run.

This commit is contained in:
Georg Brandl 2008-03-29 01:50:46 +00:00
parent 8432d86b9f
commit d9f1da0f22
2 changed files with 15 additions and 1 deletions

View File

@ -12,6 +12,9 @@ What's New in Python 2.5.3?
Core and builtins
-----------------
- Patch #1442: properly report exceptions when the PYTHONSTARTUP file
cannot be executed.
- The compilation of a class nested in another class used to leak one
reference on the outer class name.
@ -27,6 +30,7 @@ Core and builtins
- Issue #2238: Some syntax errors in *args and **kwargs expressions could give
bogus error messages.
Library
-------
@ -81,8 +85,9 @@ Build
Windows
-------
What's New in Python 2.5.2?
=============================
===========================
*Release date: 21-Feb-2008*

View File

@ -134,6 +134,15 @@ static void RunStartupFile(PyCompilerFlags *cf)
(void) PyRun_SimpleFileExFlags(fp, startup, 0, cf);
PyErr_Clear();
fclose(fp);
} else {
int save_errno;
save_errno = errno;
PySys_WriteStderr("Could not open PYTHONSTARTUP\n");
errno = save_errno;
PyErr_SetFromErrnoWithFilename(PyExc_IOError,
startup);
PyErr_Print();
PyErr_Clear();
}
}
}