Merged revisions 81844 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81844 | victor.stinner | 2010-06-08 23:00:13 +0200 (mar., 08 juin 2010) | 6 lines

  Py_FatalError(): don't sys sys.last_xxx variables

  Call PyErr_PrintEx(0) instead of PyErr_Print() to avoid a crash if
  Py_FatalError() is called in an early stage of Python initialization (if PySys
  is not yet initialized).
........

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 252b2d171b80ebab743302d55de999617fde20b1..c876fb55b863c6d22cc4f23b182e1f0b2483b818 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -2024,7 +2024,7 @@ Py_FatalError(const char *msg)
     fprintf(stderr, "Fatal Python error: %s\n", msg);
     fflush(stderr); /* it helps in Windows debug build */
     if (PyErr_Occurred()) {
-        PyErr_Print();
+        PyErr_PrintEx(0);
     }
 #ifdef MS_WINDOWS
     {