Patch #794400: Let PYTHONSTARTUP influence the compiler flags.
diff --git a/Misc/NEWS b/Misc/NEWS
index 444231e..ecc242a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
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 2cb2b64..91818e0 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -117,6 +117,19 @@
/*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 @@
}
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(