diff options
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/main.c | 23 |
2 files changed, 16 insertions, 9 deletions
@@ -12,6 +12,8 @@ What's New in Python 2.4 alpha 1? Core and builtins ----------------- +- Compiler flags set in PYTHONSTARTUP are now active in __main__. + - Added two builtin types, set() and frozenset(). - Critical bugfix, for SF bug 840829: if cyclic garbage collection diff --git a/Modules/main.c b/Modules/main.c index 2cb2b64465..91818e0df7 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -117,6 +117,19 @@ usage(int exitcode, char* program) /*NOTREACHED*/ } +static void RunStartupFile(PyCompilerFlags *cf) +{ + char *startup = Py_GETENV("PYTHONSTARTUP"); + if (startup != NULL && startup[0] != '\0') { + FILE *fp = fopen(startup, "r"); + if (fp != NULL) { + (void) PyRun_SimpleFileExFlags(fp, startup, 0, cf); + PyErr_Clear(); + fclose(fp); + } + } +} + /* Main program */ @@ -401,15 +414,7 @@ Py_Main(int argc, char **argv) } else { if (filename == NULL && stdin_is_interactive) { - char *startup = Py_GETENV("PYTHONSTARTUP"); - if (startup != NULL && startup[0] != '\0') { - FILE *fp = fopen(startup, "r"); - if (fp != NULL) { - (void) PyRun_SimpleFile(fp, startup); - PyErr_Clear(); - fclose(fp); - } - } + RunStartupFile(&cf); } /* XXX */ sts = PyRun_AnyFileExFlags( |