mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-37022: Fix bug where pdb's do_p/do_pp commands swallow exceptions from repr (GH-18180) (GH-26651)

Browse source 
(cherry picked from commit 6544b2532d)

Co-authored-by: Daniel Hahler <git@thequod.de>
This commit is contained in:
Miss Islington (bot) 2021-06-10 14:24:03 -07:00 • committed by GitHub
parent 9b889433c7
commit 175ebc60d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Lib/pdb.py
View file

@ -384,8 +384,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
sys.stdin = save_stdin
sys.displayhook = save_displayhook
except:
exc_info = sys.exc_info()[:2]
self.error(traceback.format_exception_only(*exc_info)[-1].strip())
self._error_exc()
def precmd(self, line):
"""Handle alias expansion and ';;' separator."""
@ -1104,8 +1103,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
try:
sys.call_tracing(p.run, (arg, globals, locals))
except Exception:
exc_info = sys.exc_info()[:2]
self.error(traceback.format_exception_only(*exc_info)[-1].strip())
self._error_exc()
self.message("LEAVING RECURSIVE DEBUGGER")
sys.settrace(self.trace_dispatch)
self.lastcmd = p.lastcmd
@ -1163,8 +1161,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
try:
return eval(arg, self.curframe.f_globals, self.curframe_locals)
except:
exc_info = sys.exc_info()[:2]
self.error(traceback.format_exception_only(*exc_info)[-1].strip())
self._error_exc()
raise
def _getval_except(self, arg, frame=None):
@ -1178,23 +1175,31 @@ class Pdb(bdb.Bdb, cmd.Cmd):
err = traceback.format_exception_only(*exc_info)[-1].strip()
return _rstr('** raised %s **' % err)
def _error_exc(self):
exc_info = sys.exc_info()[:2]
self.error(traceback.format_exception_only(*exc_info)[-1].strip())
def _msg_val_func(self, arg, func):
try:
val = self._getval(arg)
except:
return # _getval() has displayed the error
try:
self.message(func(val))
except:
self._error_exc()
def do_p(self, arg):
"""p expression
Print the value of the expression.
"""
try:
self.message(repr(self._getval(arg)))
except:
pass
self._msg_val_func(arg, repr)
def do_pp(self, arg):
"""pp expression
Pretty-print the value of the expression.
"""
try:
self.message(pprint.pformat(self._getval(arg)))
except:
pass
self._msg_val_func(arg, pprint.pformat)
complete_print = _complete_expression
complete_p = _complete_expression