Merged revisions 81844 via svnmerge from

Victor Stinner · Victor Stinner · commit 93362d4e6bb5 · 2010-06-08T21:05:20.000Z
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
@@ -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
     {

Original file line number	Diff line number	Diff line change
`@@ -2024,7 +2024,7 @@ Py_FatalError(const char *msg)`
`2024`	`2024`	`fprintf(stderr, "Fatal Python error: %s\n", msg);`
`2025`	`2025`	`fflush(stderr); /* it helps in Windows debug build */`
`2026`	`2026`	`if (PyErr_Occurred()) {`
`2027`		`- PyErr_Print();`
	`2027`	`+ PyErr_PrintEx(0);`
`2028`	`2028`	`}`
`2029`	`2029`	`#ifdef MS_WINDOWS`
`2030`	`2030`	`{`