gh-125512: Revert "gh-124872: Replace enter/exit events with "switched" (#124776)" (#125513)

1 files changed, 13 insertions, 4 deletions

diff --git a/Include/cpython/context.h b/Include/cpython/context.h
index 3a7a4b4..3c9be78 100644
--- a/Include/cpython/context.h
+++ b/Include/cpython/context.h
@@ -29,11 +29,20 @@ PyAPI_FUNC(int) PyContext_Exit(PyObject *);
 
 typedef enum {
     /*
-     * The current context has switched to a different context.  The object
-     * passed to the watch callback is the now-current contextvars.Context
-     * object, or None if no context is current.
+     * A context has been entered, causing the "current context" to switch to
+     * it.  The object passed to the watch callback is the now-current
+     * contextvars.Context object.  Each enter event will eventually have a
+     * corresponding exit event for the same context object after any
+     * subsequently entered contexts have themselves been exited.
      */
-    Py_CONTEXT_SWITCHED = 1,
+    Py_CONTEXT_EVENT_ENTER,
+    /*
+     * A context is about to be exited, which will cause the "current context"
+     * to switch back to what it was before the context was entered.  The
+     * object passed to the watch callback is the still-current
+     * contextvars.Context object.
+     */
+    Py_CONTEXT_EVENT_EXIT,
 } PyContextEvent;
 
 /*