Skip to content

Commit

Permalink
Clean up, fix set_trace
Browse files Browse the repository at this point in the history
This makes the code a bit easier to follow, and it uses a more
appropriate _set_stopinfo in the pause case, instead of set_step.
Use of set_step was causing set_trace to stop somewhere in the
guts of bdb.

Closes gh-663
  • Loading branch information
inducer committed Oct 15, 2024
1 parent 5fe2b2f commit b6a9014
Showing 1 changed file with 24 additions and 12 deletions.
36 changes: 24 additions & 12 deletions pudb/debugger.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,29 +266,41 @@ def set_trace(self, frame=None, as_breakpoint=None, paused=True):
as_breakpoint = True

if frame is None:
frame = thisframe = sys._getframe().f_back
else:
thisframe = frame
frame = sys._getframe().f_back
assert frame is not None

# See pudb issue #52. If this works well enough we should upstream to
# stdlib bdb.py.
# self.reset()

while frame:
frame.f_trace = self.trace_dispatch
self.botframe = frame
frame = frame.f_back
if paused:
self.enterframe = frame

thisframe_info = (
self.canonic(thisframe.f_code.co_filename), thisframe.f_lineno)
if thisframe_info not in self.set_traces or self.set_traces[thisframe_info]:
thisframe = frame
while thisframe:
thisframe.f_trace = self.trace_dispatch
self.botframe = thisframe
if sys.version_info >= (3, 13):
# save trace flags, to be restored by set_continue
self.frame_trace_lines_opcodes[thisframe] = (
thisframe.f_trace_lines,
thisframe.f_trace_opcodes)

# We need f_trace_lines == True for the debugger to work
thisframe.f_trace_lines = True

thisframe = thisframe.f_back

frame_info = (self.canonic(frame.f_code.co_filename), frame.f_lineno)
if frame_info not in self.set_traces or self.set_traces[frame_info]:
if as_breakpoint:
self.set_traces[thisframe_info] = True
self.set_traces[frame_info] = True
if self.ui.source_code_provider is not None:
self.ui.set_source_code_provider(
self.ui.source_code_provider, force_update=True)

if paused:
self.set_step()
self._set_stopinfo(frame, None)
else:
self.set_continue()
sys.settrace(self.trace_dispatch)
Expand Down

0 comments on commit b6a9014

Please sign in to comment.