From: Guido van Rossum <guido@python.org>
Date: Fri, 3 Apr 1998 21:12:12 +0000 (+0000)
Subject: Make sure that the message "Error in sys.exitfunc:" goes to sys.stderr
X-Git-Tag: v1.5.1~207
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf02fb28d9f9c6b28c1bf7be56ce87924f5742dd;p=thirdparty%2FPython%2Fcpython.git

Make sure that the message "Error in sys.exitfunc:" goes to sys.stderr
and not to C's stderr.
---

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 83a0bc14725a..87b691aed1a8 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1052,12 +1052,14 @@ call_sys_exitfunc()
 	PyObject *exitfunc = PySys_GetObject("exitfunc");
 
 	if (exitfunc) {
-		PyObject *res;
+		PyObject *res, *f;
 		Py_INCREF(exitfunc);
 		PySys_SetObject("exitfunc", (PyObject *)NULL);
+		f = PySys_GetObject("stderr");
 		res = PyEval_CallObject(exitfunc, (PyObject *)NULL);
 		if (res == NULL) {
-			fprintf(stderr, "Error in sys.exitfunc:\n");
+			if (f)
+			    PyFile_WriteString("Error in sys.exitfunc:\n", f);
 			PyErr_Print();
 		}
 		Py_DECREF(exitfunc);