Don't stop at intermediate call event...

Sometimes call tracing is set so that we can support (line) stepping to a
breakpoint. These kinds of breakpoints are not places we normally want
to stop at.

Author: rocky

test/unit/test_api.py

@@ -39,10 +39,8 @@ def test_run_xxx():
     print('Issuing: run_eval("1+2")')
     print(run_eval("1+2", debug_opts=debug_opts))
     print(debugger_output.output)
-    start_lineno = "1" if sys.version_info[:2] < (3, 11) else "0"
 
-    assert debugger_output.output[0:3] == [
-        "call - <string>:%s" % start_lineno,
+    assert debugger_output.output[0:2] == [
         "line - <string>:1",
         "return - <string>:1, 3 ",
     ]
@@ -61,7 +59,6 @@ def test_run_xxx():
     call_lineno = "16"
     for i, (prefix, suffix) in enumerate(
         (
-            ("call - ", "test/unit/test_api.py:%s" % call_lineno),
             ("line - ", "test/unit/test_api.py:17"),
             ("return - ", "test/unit/test_api.py:17, 8 "),
         )

trepan/lib/core.py

@@ -430,18 +430,23 @@ def trace_dispatch(self, frame, event: str, arg):
         # that we don't have any breakpoint set, since we have to check
         # for breakpoints in a kind of slow way of checking all events.
 
-        if (
-            event == "call"
-            and self.last_frame != frame
-            and len(self.bpmgr.bplist) == 0
-            and self.stop_level is not None
-            and self.stop_level < count_frames(frame)
-            and self.current_thread == threading.current_thread()
-        ):
-            # We are "finish"ing or "next"ing and should not be tracing into this call
-            # or any other calls from this. Return Nont to not trace further.
-            # print("""trace_dispatch: "finish"ing or "next"ing from call event""")
-            return None
+        if event == "call":
+            if (self.last_frame != frame
+                and len(self.bpmgr.bplist) == 0
+                and self.stop_level is not None
+                and self.stop_level < count_frames(frame)
+                and self.current_thread == threading.current_thread()
+                ):
+                # We are "finish"ing or "next"ing and should not be tracing into this call
+                # or any other calls from this. Return None to not trace further.
+                # print("""trace_dispatch: "finish"ing or "next"ing from call event""")
+                return None
+            elif not self.is_stop_here(frame, event):
+                # We might have a stop here as a result of a breakpoint set inside
+                # this function. In this case we need to ignore this stop, but
+                # make sure we don't turn off breapoints inside this function which
+                # we do by returning "self".
+                return self
 
         self.event = event