Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 25, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26cf4ad
gh-101326: Fix regression when passing None to FutureIter.throw
hauntsaninja Jan 25, 2023
78a74be
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 25, 2023
aa59b13
test
hauntsaninja Jan 25, 2023
a252e3a
swallow warning
hauntsaninja Jan 25, 2023
5d79981
Improve NEWS file
gvanrossum Jan 25, 2023
e53c5c8
Update Misc/NEWS.d/next/Library/2023-01-25-18-07-20.gh-issue-101326.K…
hauntsaninja Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Lib/test/test_asyncio/test_futures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2023-01-25-18-07-20.gh-issue-101326.KL4SFv.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix regression when passing ``None`` as second or third argument to ``FutureIter.throw``.
7 changes: 6 additions & 1 deletion Modules/_asynciomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down