https://github.com/python/cpython/commit/f526314194f7fd15931025f8a4439c1765666e42
commit: f526314194f7fd15931025f8a4439c1765666e42
branch: main
author: Tian Gao <[email protected]>
committer: iritkatriel <[email protected]>
date: 2024-05-13T13:38:21+01:00
summary:
gh-58933: Make pdb return to caller frame correctly when f_trace is not set
(#118979)
files:
A Misc/NEWS.d/next/Library/2024-05-12-21-38-42.gh-issue-58933.0kgU2l.rst
M Lib/bdb.py
M Lib/test/test_pdb.py
diff --git a/Lib/bdb.py b/Lib/bdb.py
index 7d63fce6ca63f1..aa621053cfb4bc 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -165,6 +165,11 @@ def dispatch_return(self, frame, arg):
# The user issued a 'next' or 'until' command.
if self.stopframe is frame and self.stoplineno != -1:
self._set_stopinfo(None, None)
+ # The previous frame might not have f_trace set, unless we are
+ # issuing a command that does not expect to stop, we should set
+ # f_trace
+ if self.stoplineno != -1:
+ self._set_caller_tracefunc(frame)
return self.trace_dispatch
def dispatch_exception(self, frame, arg):
@@ -320,15 +325,14 @@ def _set_stopinfo(self, stopframe, returnframe,
stoplineno=0, opcode=False):
self.stoplineno = stoplineno
self._set_trace_opcodes(opcode)
- def _set_caller_tracefunc(self):
+ def _set_caller_tracefunc(self, current_frame):
# Issue #13183: pdb skips frames after hitting a breakpoint and running
# step commands.
# Restore the trace function in the caller (that may not have been set
# for performance reasons) when returning from the current frame.
- if self.frame_returning:
- caller_frame = self.frame_returning.f_back
- if caller_frame and not caller_frame.f_trace:
- caller_frame.f_trace = self.trace_dispatch
+ caller_frame = current_frame.f_back
+ if caller_frame and not caller_frame.f_trace:
+ caller_frame.f_trace = self.trace_dispatch
# Derived classes and clients can call the following methods
# to affect the stepping state.
@@ -343,12 +347,10 @@ def set_until(self, frame, lineno=None):
def set_step(self):
"""Stop after one line of code."""
- self._set_caller_tracefunc()
self._set_stopinfo(None, None)
def set_stepinstr(self):
"""Stop before the next instruction."""
- self._set_caller_tracefunc()
self._set_stopinfo(None, None, opcode=True)
def set_next(self, frame):
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index f47466410082ef..1b329b205d2d0f 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -1453,6 +1453,58 @@ def test_post_mortem():
"""
+def test_pdb_return_to_different_file():
+ """When pdb returns to a different file, it should not skip if f_trace is
+ not already set
+
+ >>> import pprint
+
+ >>> class A:
+ ... def __repr__(self):
+ ... return 'A'
+
+ >>> def test_function():
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ ... pprint.pprint(A())
+
+ >>> reset_Breakpoint()
+ >>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE
+ ... 'b A.__repr__',
+ ... 'continue',
+ ... 'return',
+ ... 'next',
+ ... 'return',
+ ... 'return',
+ ... 'continue',
+ ... ]):
+ ... test_function()
+ > <doctest
test.test_pdb.test_pdb_return_to_different_file[2]>(2)test_function()
+ -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ (Pdb) b A.__repr__
+ Breakpoint 1 at <doctest
test.test_pdb.test_pdb_return_to_different_file[1]>:3
+ (Pdb) continue
+ > <doctest test.test_pdb.test_pdb_return_to_different_file[1]>(3)__repr__()
+ -> return 'A'
+ (Pdb) return
+ --Return--
+ > <doctest
test.test_pdb.test_pdb_return_to_different_file[1]>(3)__repr__()->'A'
+ -> return 'A'
+ (Pdb) next
+ > ...pprint.py..._safe_repr()
+ -> return rep,...
+ (Pdb) return
+ --Return--
+ > ...pprint.py..._safe_repr()->('A'...)
+ -> return rep,...
+ (Pdb) return
+ --Return--
+ > ...pprint.py...format()->('A'...)
+ -> return...
+ (Pdb) continue
+ A
+ """
+
+
def test_pdb_skip_modules():
"""This illustrates the simple case of module skipping.
diff --git
a/Misc/NEWS.d/next/Library/2024-05-12-21-38-42.gh-issue-58933.0kgU2l.rst
b/Misc/NEWS.d/next/Library/2024-05-12-21-38-42.gh-issue-58933.0kgU2l.rst
new file mode 100644
index 00000000000000..fa70b954e1e9ee
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-05-12-21-38-42.gh-issue-58933.0kgU2l.rst
@@ -0,0 +1 @@
+Make :mod:`pdb` return to caller frame correctly when ``f_trace`` of the
caller frame is not set
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
