Skip to content

gh-80675: Set f_trace_lines = True on all frames upon pdb.set_trace() #110881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 4, 2023
Merged

gh-80675: Set f_trace_lines = True on all frames upon pdb.set_trace() #110881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
837caa0
Set f_trace_lines = True for all frames upon pdb.set_trace()
gaogaotiantian Oct 14, 2023
b4174b0
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 14, 2023
79586b7
Apply suggestions from code review
gaogaotiantian Oct 15, 2023
0985f21
Merge branch 'main' into pdb-frame-traceline
gaogaotiantian Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Lib/bdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def __init__(self, skip=None):
self.skip = set(skip) if skip else None
self.breaks = {}
self.fncache = {}
self.frame_trace_lines = {}
self.frame_returning = None

self._load_breaks()
Expand Down Expand Up @@ -331,6 +332,9 @@ def set_trace(self, frame=None):
while frame:
frame.f_trace = self.trace_dispatch
self.botframe = frame
# We need f_trace_liens == True for the debugger to work
self.frame_trace_lines[frame] = frame.f_trace_lines
frame.f_trace_lines = True
frame = frame.f_back
self.set_step()
sys.settrace(self.trace_dispatch)
Expand All @@ -349,6 +353,9 @@ def set_continue(self):
while frame and frame is not self.botframe:
del frame.f_trace
frame = frame.f_back
for frame, prev_trace_lines in self.frame_trace_lines.items():
frame.f_trace_lines = prev_trace_lines
self.frame_trace_lines = {}

def set_quit(self):
"""Set quitting attribute to True.
Expand Down
24 changes: 24 additions & 0 deletions Lib/test/test_pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2350,6 +2350,30 @@ def test_pdb_ambiguous_statements():
(Pdb) continue
"""

def test_pdb_f_trace_lines():
"""GH-80675

pdb should work even if f_trace_lines is set to False on some frames.

>>> reset_Breakpoint()

>>> def test_function():
... import sys
... frame = sys._getframe()
... frame.f_trace_lines = False
... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
... if frame.f_trace_lines != False:
... print("f_trace_lines is not reset after continue!")

>>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
... 'continue'
... ]):
... test_function()
> <doctest test.test_pdb.test_pdb_f_trace_lines[1]>(6)test_function()
-> if frame.f_trace_lines != False:
(Pdb) continue
"""

def test_pdb_function_break():
"""Testing the line number of break on function

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2023-10-14-20-15-53.gh-issue-80675._M-cQC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Set ``f_trace_lines = True`` on all frames upon :func:`pdb.set_trace()`