Fix for bug #1442 pythonstartup addition of minor error checking

tiran · tiran · commit e69a08ea933e · 2007-11-14T16:21:32.000Z
Python failed to report an error when it wasn't able to open the PYTHONSTARTUP file.
diff --git a/Modules/main.c b/Modules/main.c
@@ -132,6 +132,16 @@ 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();
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,16 @@ static void RunStartupFile(PyCompilerFlags *cf)`
`132`	`132`	`(void) PyRun_SimpleFileExFlags(fp, startup, 0, cf);`
`133`	`133`	`PyErr_Clear();`
`134`	`134`	`fclose(fp);`
	`135`	`+ } else {`
	`136`	`+ int save_errno;`
	`137`	`+`
	`138`	`+ save_errno = errno;`
	`139`	`+ PySys_WriteStderr("Could not open PYTHONSTARTUP\n");`
	`140`	`+ errno = save_errno;`
	`141`	`+ PyErr_SetFromErrnoWithFilename(PyExc_IOError,`
	`142`	`+ startup);`
	`143`	`+ PyErr_Print();`
	`144`	`+ PyErr_Clear();`
`135`	`145`	`}`
`136`	`146`	`}`
`137`	`147`	`}`