gh-101326: Fix regression when passing None to FutureIter.throw (#101327)

hauntsaninja · web-flow · commit a178ba82bfe2 · 2023-01-25T12:01:01.000-08:00
diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
@@ -612,6 +612,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
@@ -1694,7 +1694,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
`@@ -1694,7 +1694,12 @@ FutureIter_throw(futureiterobject self, PyObject const *args, Py_ssize_t nargs`
`1694`	`1694`	`val = args[1];`
`1695`	`1695`	`}`
`1696`	`1696`
`1697`		`- if (tb != NULL && !PyTraceBack_Check(tb)) {`
	`1697`	`+ if (val == Py_None) {`
	`1698`	`+ val = NULL;`
	`1699`	`+ }`
	`1700`	`+ if (tb == Py_None ) {`
	`1701`	`+ tb = NULL;`
	`1702`	`+ } else if (tb != NULL && !PyTraceBack_Check(tb)) {`
`1698`	`1703`	`PyErr_SetString(PyExc_TypeError, "throw() third argument must be a traceback");`
`1699`	`1704`	`return NULL;`
`1700`	`1705`	`}`