summaryrefslogtreecommitdiff
path: root/Lib/traceback.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2015-07-24 17:36:21 +0300
committerBerker Peksag <berker.peksag@gmail.com>2015-07-24 17:36:21 +0300
commitc3f417dc47b3a9564608c98cd176c530d9ebdf09 (patch)
tree6a1c894fe313dcbcf82a4425704ad580bd9b45f6 /Lib/traceback.py
parentc19bb3279cbb42c84a24255db48ee2d385bb8167 (diff)
downloadcpython-git-c3f417dc47b3a9564608c98cd176c530d9ebdf09.tar.gz
Issue #24695: Fix a regression in traceback.print_exception()
If exc_traceback is None we shouldn't print a traceback header like described in the documentation.
Diffstat (limited to 'Lib/traceback.py')
-rw-r--r--Lib/traceback.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 61c9fb57ac..02edeb6217 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -453,6 +453,7 @@ class TracebackException:
_seen=_seen)
else:
context = None
+ self.exc_traceback = exc_traceback
self.__cause__ = cause
self.__context__ = context
self.__suppress_context__ = \
@@ -561,6 +562,7 @@ class TracebackException:
not self.__suppress_context__):
yield from self.__context__.format(chain=chain)
yield _context_message
- yield 'Traceback (most recent call last):\n'
+ if self.exc_traceback is not None:
+ yield 'Traceback (most recent call last):\n'
yield from self.stack.format()
yield from self.format_exception_only()