python · markshannon · Mar 18, 2025 · Mar 18, 2025 · Mar 18, 2025 · Mar 18, 2025
diff --git a/Include/internal/pycore_global_objects_fini_generated.h b/Include/internal/pycore_global_objects_fini_generated.h
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
@@ -117,6 +117,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(__fspath__)
         STRUCT_FOR_ID(__ge__)
         STRUCT_FOR_ID(__get__)
+        STRUCT_FOR_ID(__get_local_events__)
         STRUCT_FOR_ID(__getattr__)
         STRUCT_FOR_ID(__getattribute__)
         STRUCT_FOR_ID(__getinitargs__)
@@ -203,6 +204,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(__rtruediv__)
         STRUCT_FOR_ID(__rxor__)
         STRUCT_FOR_ID(__set__)
+        STRUCT_FOR_ID(__set_local_events__)
         STRUCT_FOR_ID(__set_name__)
         STRUCT_FOR_ID(__setattr__)
         STRUCT_FOR_ID(__setitem__)
@@ -409,6 +411,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(errors)
         STRUCT_FOR_ID(event)
         STRUCT_FOR_ID(eventmask)
+        STRUCT_FOR_ID(events)
         STRUCT_FOR_ID(exc_type)
         STRUCT_FOR_ID(exc_value)
         STRUCT_FOR_ID(excepthook)
@@ -746,6 +749,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(times)
         STRUCT_FOR_ID(timetuple)
         STRUCT_FOR_ID(timeunit)
+        STRUCT_FOR_ID(tool)
         STRUCT_FOR_ID(top)
         STRUCT_FOR_ID(trace_callback)
         STRUCT_FOR_ID(traceback)

diff --git a/Include/internal/pycore_instruments.h b/Include/internal/pycore_instruments.h
@@ -29,8 +29,8 @@ typedef uint32_t _PyMonitoringEventSet;
 PyObject *_PyMonitoring_RegisterCallback(int tool_id, int event_id, PyObject *obj);
 
 int _PyMonitoring_SetEvents(int tool_id, _PyMonitoringEventSet events);
-int _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEventSet events);
-int _PyMonitoring_GetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEventSet *events);
+int _PyMonitoring_SetLocalEvents(PyObject *codelike, int tool_id, _PyMonitoringEventSet events);
+int _PyMonitoring_GetLocalEvents(PyObject *codelike, int tool_id, _PyMonitoringEventSet *events);
 
 extern int
 _Py_call_instrumentation(PyThreadState *tstate, int event,

diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
diff --git a/Include/internal/pycore_unicodeobject_generated.h b/Include/internal/pycore_unicodeobject_generated.h
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
@@ -1412,7 +1412,6 @@ def check_events(self, func, expected, tool=TEST_TOOL, recorders=()):
             for recorder in recorders:
                 sys.monitoring.register_callback(tool, recorder.event_type, None)
 
-
     def test_simple(self):
 
         def func1():
@@ -1461,6 +1460,27 @@ def test_set_non_local_event(self):
         with self.assertRaises(ValueError):
             sys.monitoring.set_local_events(TEST_TOOL, just_call.__code__, E.RAISE)
 
+
+    def test_code_like(self):
+        class CodeLike:
+
+            def __init__(self):
+                self.events = [ 0 ] * 8
+
+            def __get_local_events__(self, tool):
+                return self.events[tool]
+
+            def __set_local_events__(self, tool, events):
+                self.events[tool] = events
+
+        codelike = CodeLike()
+        tool = TEST_TOOL
+        for events in ((E.LINE | E.PY_START), (E.BRANCH_LEFT | E.BRANCH_RIGHT), 0):
+            sys.monitoring.set_local_events(tool, codelike, events)
+            self.assertEqual(codelike.__get_local_events__(tool), events)
+            self.assertEqual(sys.monitoring.get_local_events(tool, codelike), events)
+
+
 def line_from_offset(code, offset):
     for start, end, line in code.co_lines():
         if start <= offset < end:
@@ -2062,7 +2082,13 @@ def f():
         pass
 
     def test_get_local_events_uninitialized(self):
-        self.assertEqual(sys.monitoring.get_local_events(TEST_TOOL, self.f.__code__), 0)
+        with self.assertRaises(ValueError):
+            sys.monitoring.get_local_events(TEST_TOOL, self.f.__code__)
+        sys.monitoring.use_tool_id(TEST_TOOL, "test unitialized")
+        try:
+            self.assertEqual(sys.monitoring.get_local_events(TEST_TOOL, self.f.__code__), 0)
+        finally:
+            sys.monitoring.free_tool_id(TEST_TOOL)
 
 class TestRegressions(MonitoringTestBase, unittest.TestCase):
 

diff --git a/Objects/clinic/codeobject.c.h b/Objects/clinic/codeobject.c.h