Apr 12, 2023 · Nov 9, 2022 · Nov 18, 2022 · Nov 28, 2022 · Nov 28, 2022 · Dec 2, 2022
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
                (6, 'line')])


 class TestSetLocalTrace(TraceTestCase):

    def test_with_branches(self):
        events = []

        def tracefunc(frame, event, arg):
            if frame.f_code.co_name == "func":
                frame.f_trace = tracefunc
                line = frame.f_lineno - frame.f_code.co_firstlineno
                events.append((line, event))
            return tracefunc
        def func(arg = 1):
            N = 1
            if arg >= 2:  # step 1
                not_reached = 3
            else:
                reached = 5
            if arg >= 3:  # step 3
                not_reached = 7
            else:
                reached = 9
            the_end = 10

        EXPECTED_EVENTS = [
            (0, 'call'),
            (1, 'line'),
            (2, 'line'),
            (5, 'line'),
            (6, 'line'),
            (9, 'line'),
            (10, 'line'),
            (10, 'return'),
        ]

        sys.settrace(tracefunc)
        sys._getframe().f_trace = tracefunc
        func()
        self.assertEqual(events, EXPECTED_EVENTS)
        sys.settrace(None)



 if __name__ == "__main__":
    unittest.main()
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
    if (v == Py_None) {
        v = NULL;
    }
    Py_XSETREF(f->f_trace, Py_XNewRef(v));
    f->f_last_traced_line = -1;
    if (v != f->f_trace) {
        Py_XSETREF(f->f_trace, Py_XNewRef(v));
        f->f_last_traced_line = -1;
    }
    return 0;
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2825,5 +2825,47 @@ def test_events(self):
		(6, 'line')])


		class TestSetLocalTrace(TraceTestCase):

		def test_with_branches(self):
		events = []

		def tracefunc(frame, event, arg):
		if frame.f_code.co_name == "func":
		frame.f_trace = tracefunc
		line = frame.f_lineno - frame.f_code.co_firstlineno
		events.append((line, event))
		return tracefunc
		def func(arg = 1):
		N = 1
		if arg >= 2: # step 1
		not_reached = 3
		else:
		reached = 5
		if arg >= 3: # step 3
		not_reached = 7
		else:
		reached = 9
		the_end = 10

		EXPECTED_EVENTS = [
		(0, 'call'),
		(1, 'line'),
		(2, 'line'),
		(5, 'line'),
		(6, 'line'),
		(9, 'line'),
		(10, 'line'),
		(10, 'return'),
		]

		sys.settrace(tracefunc)
		sys._getframe().f_trace = tracefunc
		func()
		self.assertEqual(events, EXPECTED_EVENTS)
		sys.settrace(None)



		if __name__ == "__main__":
		unittest.main()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -852,8 +852,10 @@ frame_settrace(PyFrameObject f, PyObject v, void *closure)
		if (v == Py_None) {
		v = NULL;
		}
		Py_XSETREF(f->f_trace, Py_XNewRef(v));
		f->f_last_traced_line = -1;
		if (v != f->f_trace) {
		Py_XSETREF(f->f_trace, Py_XNewRef(v));
		f->f_last_traced_line = -1;
		}
		return 0;
		}

Expand Down