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

hauntsaninja · web-flow · commit cd0fe5ba09df · 2023-01-25T13:01:13.000-08:00
(cherry picked from commit a178ba8) 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
@@ -607,6 +607,8 @@ def test_future_iter_throw(self):
                           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
@@ -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
@@ -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;
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix regression when passing ``None`` as second or third argument to ``FutureIter.throw``.
Original file line number	Diff line number	Diff line change
`@@ -1666,7 +1666,12 @@ FutureIter_throw(futureiterobject self, PyObject const *args, Py_ssize_t nargs`
`1666`	`1666`	`val = args[1];`
`1667`	`1667`	`}`
`1668`	`1668`
`1669`		`- if (tb != NULL && !PyTraceBack_Check(tb)) {`
	`1669`	`+ if (val == Py_None) {`
	`1670`	`+ val = NULL;`
	`1671`	`+ }`
	`1672`	`+ if (tb == Py_None ) {`
	`1673`	`+ tb = NULL;`
	`1674`	`+ } else if (tb != NULL && !PyTraceBack_Check(tb)) {`
`1670`	`1675`	`PyErr_SetString(PyExc_TypeError, "throw() third argument must be a traceback");`
`1671`	`1676`	`return NULL;`
`1672`	`1677`	`}`