summaryrefslogtreecommitdiffstats
path: root/Lib/traceback.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2015-07-24 14:37:27 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2015-07-24 14:37:27 (GMT)
commit0bb2c217b4df367413409d6c46034709d784c7f3 (patch)
treea3f56aa289769a7e45e520bc9ab947b835bd5a5f /Lib/traceback.py
parente0fcf2d205f1225a2ca8c53cb955073758635b69 (diff)
parentc3f417dc47b3a9564608c98cd176c530d9ebdf09 (diff)
downloadcpython-0bb2c217b4df367413409d6c46034709d784c7f3.zip
cpython-0bb2c217b4df367413409d6c46034709d784c7f3.tar.gz
cpython-0bb2c217b4df367413409d6c46034709d784c7f3.tar.bz2
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 61c9fb5..02edeb6 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()