replace athrow().close() and asend().close() stubs with implimentations

graingert · Apr 15, 2024 · d5d0867 · d5d0867
1 parent 3131a70
commit d5d0867
Showing 1 changed file with 34 additions and 4 deletions.
diff --git a/Objects/genobject.c b/Objects/genobject.c
@@ -1843,8 +1843,23 @@ async_gen_asend_throw(PyAsyncGenASend *o, PyObject *const *args, Py_ssize_t narg
 static PyObject *
 async_gen_asend_close(PyAsyncGenASend *o, PyObject *args)
 {
-    o->ags_state = AWAITABLE_STATE_CLOSED;
-    Py_RETURN_NONE;
+    PyObject *result;
+    if (o->ags_state == AWAITABLE_STATE_CLOSED) {
+        Py_RETURN_NONE;
+    }
+    result = async_gen_asend_throw(PyExc_GeneratorExit);
+    if (retval == NULL) {
+        if (PyErr_ExceptionMatches(PyExc_StopIteration) ||
+            PyErr_ExceptionMatches(PyExc_StopAsyncIteration) ||
+            PyErr_ExceptionMatches(PyExc_GeneratorExit))
+        {
+            PyErr_Clear();
+            Py_RETURN_NONE;
+        }
+    } else {
+        Py_DECREF(retval);
+        PyErr_SetString(PyExc_RuntimeError, "coroutine ignored GeneratorExit");
+    }
 }
 
 static void
@@ -2288,8 +2303,23 @@ async_gen_athrow_iternext(PyAsyncGenAThrow *o)
 static PyObject *
 async_gen_athrow_close(PyAsyncGenAThrow *o, PyObject *args)
 {
-    o->agt_state = AWAITABLE_STATE_CLOSED;
-    Py_RETURN_NONE;
+    PyObject *result;
+    if (o->agt_state == AWAITABLE_STATE_CLOSED) {
+        Py_RETURN_NONE;
+    }
+    result = async_gen_athrow_throw(PyExc_GeneratorExit);
+    if (retval == NULL) {
+        if (PyErr_ExceptionMatches(PyExc_StopIteration) ||
+            PyErr_ExceptionMatches(PyExc_StopAsyncIteration) ||
+            PyErr_ExceptionMatches(PyExc_GeneratorExit))
+        {
+            PyErr_Clear();
+            Py_RETURN_NONE;
+        }
+    } else {
+        Py_DECREF(retval);
+        PyErr_SetString(PyExc_RuntimeError, "coroutine ignored GeneratorExit");
+    }
 }