From d9f1da0f2202f0af2aa8460fff63f583d3324c51 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 29 Mar 2008 01:50:46 +0000 Subject: [PATCH] Backport #1442: report exception when startup file cannot be run. --- Misc/NEWS | 7 ++++++- Modules/main.c | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index c914050134a..7e161193a13 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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* diff --git a/Modules/main.c b/Modules/main.c index 80c0c04c310..1700b4e4ae5 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -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(); } } }