diff options
| -rwxr-xr-x | Lib/pdb.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Lib/pdb.py b/Lib/pdb.py index e62f91368b..d80a29b689 100755 --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -413,6 +413,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): def user_return(self, frame, return_value): """This function is called when a return trap is set here.""" + if self._wait_for_mainpyfile: + return frame.f_locals['__return__'] = return_value print('--Return--', file=self.stdout) self.interaction(frame, None) @@ -420,6 +422,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): def user_exception(self, frame, exc_info): """This function is called if an exception occurs, but only if we are to stop at or just below this level.""" + if self._wait_for_mainpyfile: + return exc_type, exc_value, exc_traceback = exc_info frame.f_locals['__exception__'] = exc_type, exc_value exc_type_name = exc_type.__name__ @@ -475,6 +475,9 @@ C-API Library ------- +- Issue #6719: In pdb, do not stop somewhere in the encodings machinery + if the source file to be debugged is in a non-builtin encoding. + - Issue #8048: Prevent doctests from failing when sys.displayhook has been reassigned. |