summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-28 16:16:09 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-28 16:16:09 (GMT)
commitbcc63a86a943b03e7472109cbf6d7f962f6b0b5a (patch)
treec4d72e31f48fd3708ed6f133bcebb85b5ecda2ef /Python
parent875ada4b0fefd2e399719d728073b681a04d31b4 (diff)
downloadcpython-bcc63a86a943b03e7472109cbf6d7f962f6b0b5a.zip
cpython-bcc63a86a943b03e7472109cbf6d7f962f6b0b5a.tar.gz
cpython-bcc63a86a943b03e7472109cbf6d7f962f6b0b5a.tar.bz2
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')
-rw-r--r--Python/pythonrun.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 875e44e..3764740 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();