diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-06-08 21:05:20 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-06-08 21:05:20 (GMT) |
| commit | 93362d4e6bb5fbcc1b60ec88676c5d12583350fd (patch) | |
| tree | 559426dc6079e284bc9c969bb91b0ad3220b6db8 | |
| parent | 7f99f092eb7a8b1f93e68c307f4d115a93cfa1c9 (diff) | |
| download | cpython-93362d4e6bb5fbcc1b60ec88676c5d12583350fd.zip cpython-93362d4e6bb5fbcc1b60ec88676c5d12583350fd.tar.gz cpython-93362d4e6bb5fbcc1b60ec88676c5d12583350fd.tar.bz2 | |
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).
........
| -rw-r--r-- | Python/pythonrun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 252b2d1..c876fb5 100644 --- 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 { |