Merge remote-tracking branch 'upstream/main' into asyncio_rest_thread…

…safe
python · Fidget-Spinner · Jul 11, 2024 · Jul 12, 2024 · Jul 12, 2024 · Jul 12, 2024
commit b450b96beff8caa41438f84d1eecf500ebdc655a
@@ -2054,7 +2054,7 @@ register_eager_task(asyncio_state *state, PyObject *task)
 }
 
 static void
-unregister_task_lock_held(asyncio_state *state, TaskObj *task)
+unregister_task(asyncio_state *state, TaskObj *task)
 {
     ASYNCIO_STATE_LOCK(state);
     assert(Task_Check(state, task));
@@ -2079,14 +2079,6 @@ unregister_task_lock_held(asyncio_state *state, TaskObj *task)
     ASYNCIO_STATE_UNLOCK(state);
 }
 
-static void
-unregister_task(asyncio_state *state, TaskObj *task)
-{
-    ASYNCIO_STATE_LOCK(state);
-    unregister_task_lock_held(state, task);
-    ASYNCIO_STATE_UNLOCK(state);
-}
-
 static int
 unregister_eager_task(asyncio_state *state, PyObject *task)
 {