summaryrefslogtreecommitdiff
path: root/Python/pythonrun.c
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-28 16:16:09 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-28 16:16:09 +0000
commitd4399abbf40fb825560f77dc33e2917ec205e89f (patch)
tree3d407bd12fe77df74a340475c6e8ba5ce9abfc22 /Python/pythonrun.c
parent4de4e75cd1dcfe928cd2c901b767f8e67430b99c (diff)
downloadcpython-d4399abbf40fb825560f77dc33e2917ec205e89f.tar.gz
Merged revisions 76573 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r76573 | antoine.pitrou | 2009-11-28 17:12:28 +0100 (sam., 28 nov. 2009) | 3 lines Issue #4486: When an exception has an explicit cause, do not print its implicit context too. ........
Diffstat (limited to 'Python/pythonrun.c')
-rw-r--r--Python/pythonrun.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 875e44e99b..3764740e81 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1576,7 +1576,7 @@ print_exception_recursive(PyObject *f, PyObject *value, PyObject *seen)
cause_message, f);
}
}
- if (context) {
+ else if (context) {
res = PySet_Contains(seen, context);
if (res == -1)
PyErr_Clear();