Mercurial > cpython-lru_cache-weakref
comparison Python/pythonrun.c @ 57498:4bed796ee0d7 3.1
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.
........
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Sat, 28 Nov 2009 16:16:09 +0000 |
| parents | 29b3e126c0c2 |
| children | c2d2e26bcf7f 9b5806a008e7 |
comparison
equal
deleted
inserted
replaced
| 57491:3d77d7c16c90 | 57498:4bed796ee0d7 |
|---|---|
| 1574 f, cause, seen); | 1574 f, cause, seen); |
| 1575 err |= PyFile_WriteString( | 1575 err |= PyFile_WriteString( |
| 1576 cause_message, f); | 1576 cause_message, f); |
| 1577 } | 1577 } |
| 1578 } | 1578 } |
| 1579 if (context) { | 1579 else if (context) { |
| 1580 res = PySet_Contains(seen, context); | 1580 res = PySet_Contains(seen, context); |
| 1581 if (res == -1) | 1581 if (res == -1) |
| 1582 PyErr_Clear(); | 1582 PyErr_Clear(); |
| 1583 if (res == 0) { | 1583 if (res == 0) { |
| 1584 print_exception_recursive( | 1584 print_exception_recursive( |