[Python-checkins] r81846 - in python/branches/release31-maint: Python/pythonrun.c
victor.stinner
python-checkins at python.org
Tue Jun 8 23:05:20 CEST 2010
Author: victor.stinner
Date: Tue Jun 8 23:05:20 2010
New Revision: 81846
Log:
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).
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Python/pythonrun.c
Modified: python/branches/release31-maint/Python/pythonrun.c
==============================================================================
--- python/branches/release31-maint/Python/pythonrun.c (original)
+++ python/branches/release31-maint/Python/pythonrun.c Tue Jun 8 23:05:20 2010
@@ -2024,7 +2024,7 @@
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
{
More information about the Python-checkins
mailing list