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.
........
This commit is contained in:
Antoine Pitrou 2009-11-28 16:16:09 +00:00
parent 875ada4b0f
commit bcc63a86a9
4 changed files with 30 additions and 5 deletions

View file

@ -120,13 +120,14 @@ def _iter_chain(exc, custom_tb=None, seen=None):
seen.add(exc)
its = []
cause = exc.__cause__
context = exc.__context__
if cause is not None and cause not in seen:
its.append(_iter_chain(cause, None, seen))
its.append([(_cause_message, None)])
if context is not None and context is not cause and context not in seen:
its.append(_iter_chain(context, None, seen))
its.append([(_context_message, None)])
else:
context = exc.__context__
if context is not None and context not in seen:
its.append(_iter_chain(context, None, seen))
its.append([(_context_message, None)])
its.append([(exc, custom_tb or exc.__traceback__)])
# itertools.chain is in an extension module and may be unavailable
for it in its: