[3.11] gh-101326: Fix regression when passing None to FutureIter.throw (GH-101327...

(cherry picked from commit a178ba82bfe2f2fb6f6ff0e67cb734fd7c4321e3)

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>

diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index 987772e0b1964b85fb9d0c5892e49ebdbadb3a02..c6aad824c78d06ba4a58b8d33d8e7466e55fe501 100644 (file)
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -607,6 +607,8 @@ class BaseFutureTests:
                           Exception, Exception("elephant"), 32)
         self.assertRaises(TypeError, fi.throw,
                           Exception("elephant"), Exception("elephant"))
+        # https://github.com/python/cpython/issues/101326
+        self.assertRaises(ValueError, fi.throw, ValueError, None, None)
         self.assertRaises(TypeError, fi.throw, list)
 
     def test_future_del_collect(self):

diff --git a/Misc/NEWS.d/next/Library/2023-01-25-18-07-20.gh-issue-101326.KL4SFv.rst b/Misc/NEWS.d/next/Library/2023-01-25-18-07-20.gh-issue-101326.KL4SFv.rst
new file mode 100644 (file)
index 0000000..54b69b9
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-01-25-18-07-20.gh-issue-101326.KL4SFv.rst
@@ -0,0 +1 @@
+Fix regression when passing ``None`` as second or third argument to ``FutureIter.throw``.

diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 40f1f80be4473a209b41952c023081133955ec62..b2fef017050b22e9c1bb62a575223ebf7421824d 100644 (file)
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -1666,7 +1666,12 @@ FutureIter_throw(futureiterobject *self, PyObject *const *args, Py_ssize_t nargs
         val = args[1];
     }
 
-    if (tb != NULL && !PyTraceBack_Check(tb)) {
+    if (val == Py_None) {
+        val = NULL;
+    }
+    if (tb == Py_None ) {
+        tb = NULL;
+    } else if (tb != NULL && !PyTraceBack_Check(tb)) {
         PyErr_SetString(PyExc_TypeError, "throw() third argument must be a traceback");
         return NULL;
     }