mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #12643: Respect sys.excepthook in code.InteractiveConsole

Browse source
This commit is contained in:
Nick Coghlan 2012-08-20 23:02:28 +10:00
parent c0c03be53e
commit 8bd24fe9ff
5 changed files with 91 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/code.py
View file

@ -105,9 +105,10 @@ class InteractiveInterpreter:
The output is written by self.write(), below.
"""
type, value, sys.last_traceback = sys.exc_info()
type, value, tb = sys.exc_info()
sys.last_type = type
sys.last_value = value
sys.last_traceback = tb
if filename and type is SyntaxError:
# Work hard to stuff the correct filename in the exception
try:
@ -119,8 +120,13 @@ class InteractiveInterpreter:
# Stuff in the right filename
value = SyntaxError(msg, (filename, lineno, offset, line))
sys.last_value = value
lines = traceback.format_exception_only(type, value)
self.write(''.join(lines))
if sys.excepthook is sys.__excepthook__:
lines = traceback.format_exception_only(type, value)
self.write(''.join(lines))
else:
# If someone has set sys.excepthook, we let that take precedence
# over self.write
sys.excepthook(type, value, tb)
def showtraceback(self):
"""Display the exception that just occurred.
@ -143,7 +149,12 @@ class InteractiveInterpreter:
lines.extend(traceback.format_exception_only(type, value))
finally:
tblist = tb = None
self.write(''.join(lines))
if sys.excepthook is sys.__excepthook__:
self.write(''.join(lines))
else:
# If someone has set sys.excepthook, we let that take precedence
# over self.write
sys.excepthook(type, value, tb)
def write(self, data):
"""Write a string.