From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Thu, 19 Jul 2012 21:02:03 +0000 (+0000)
Subject: Issue #15365:  Make traceback reporting ignore any errors when printing out
X-Git-Tag: v3.3.0b2~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5963d38429595ed334e129096815a6f56e81035;p=python

Issue #15365:  Make traceback reporting ignore any errors when printing out
the source line.  Such errors can't be reported anyway.  This makes error
reporting work, even if the "io" module can't be loaded.
---

diff --git a/Python/traceback.c b/Python/traceback.c
index c8b3ee1b63..ce670f3d2c 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -344,7 +344,10 @@ tb_displayline(PyObject *f, PyObject *filename, int lineno, PyObject *name)
     Py_DECREF(line);
     if (err != 0)
         return err;
-    return _Py_DisplaySourceLine(f, filename, lineno, 4);
+    /* ignore errors since we can't report them, can we? */
+    if (_Py_DisplaySourceLine(f, filename, lineno, 4))
+        PyErr_Clear();
+    return err;
 }
 
 static int