Skip to content

gh-118473: Fix set_asyncgen_hooks not to be partially set when arguments are invalid #118474

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
gvanrossum merged 3 commits into from
May 7, 2024
Merged

gh-118473: Fix set_asyncgen_hooks not to be partially set when arguments are invalid #118474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5297865
gh-118473: Fix set_asyncgen_hooks not to allow partial setup
youknowone May 1, 2024
f2fa7fb
Apply review
youknowone May 2, 2024
3e60305
Separate callable check step
youknowone May 2, 2024
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
16 changes: 15 additions & 1 deletion Lib/test/test_sys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1779,14 +1779,28 @@ def test_asyncgen_hooks(self):
self.assertIsNone(old.finalizer)

firstiter = lambda *a: None
finalizer = lambda *a: None

with self.assertRaises(TypeError):
sys.set_asyncgen_hooks(firstiter=firstiter, finalizer="invalid")
cur = sys.get_asyncgen_hooks()
self.assertIsNone(cur.firstiter)
self.assertIsNone(cur.finalizer)

# gh-118473
with self.assertRaises(TypeError):
sys.set_asyncgen_hooks(firstiter="invalid", finalizer=finalizer)
cur = sys.get_asyncgen_hooks()
self.assertIsNone(cur.firstiter)
self.assertIsNone(cur.finalizer)

sys.set_asyncgen_hooks(firstiter=firstiter)
hooks = sys.get_asyncgen_hooks()
self.assertIs(hooks.firstiter, firstiter)
self.assertIs(hooks[0], firstiter)
self.assertIs(hooks.finalizer, None)
self.assertIs(hooks[1], None)

finalizer = lambda *a: None
sys.set_asyncgen_hooks(finalizer=finalizer)
hooks = sys.get_asyncgen_hooks()
self.assertIs(hooks.firstiter, firstiter)
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2024-05-01-22-43-54.gh-issue-118473.QIvq9R.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix :func:`sys.set_asyncgen_hooks` not to be partially set when raising :exc:`TypeError`.
28 changes: 20 additions & 8 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1407,12 +1407,6 @@ sys_set_asyncgen_hooks(PyObject *self, PyObject *args, PyObject *kw)
Py_TYPE(finalizer)->tp_name);
return NULL;
}
if (_PyEval_SetAsyncGenFinalizer(finalizer) < 0) {
return NULL;
}
}
else if (finalizer == Py_None && _PyEval_SetAsyncGenFinalizer(NULL) < 0) {
return NULL;
}

if (firstiter && firstiter != Py_None) {
Expand All @@ -1422,15 +1416,33 @@ sys_set_asyncgen_hooks(PyObject *self, PyObject *args, PyObject *kw)
Py_TYPE(firstiter)->tp_name);
return NULL;
}
if (_PyEval_SetAsyncGenFirstiter(firstiter) < 0) {
}

PyObject *cur_finalizer = _PyEval_GetAsyncGenFinalizer();

if (finalizer && finalizer != Py_None) {
if (_PyEval_SetAsyncGenFinalizer(finalizer) < 0) {
return NULL;
}
}
else if (firstiter == Py_None && _PyEval_SetAsyncGenFirstiter(NULL) < 0) {
else if (finalizer == Py_None && _PyEval_SetAsyncGenFinalizer(NULL) < 0) {
return NULL;
}

if (firstiter && firstiter != Py_None) {
if (_PyEval_SetAsyncGenFirstiter(firstiter) < 0) {
goto error;
}
}
else if (firstiter == Py_None && _PyEval_SetAsyncGenFirstiter(NULL) < 0) {
goto error;
}

Py_RETURN_NONE;

error:
_PyEval_SetAsyncGenFinalizer(cur_finalizer);
return NULL;
}

PyDoc_STRVAR(set_asyncgen_hooks_doc,
Expand Down