Skip to content

gh-100762: Switch order of exception match in gen_close #101011

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

Closed
wants to merge 6 commits into from
+2 −2
Closed

gh-100762: Switch order of exception match in gen_close #101011

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d4605e
switch order of exception match in gen_close
eendebakpt Jan 13, 2023
6c0cef2
Merge branch 'main' into gen_close
eendebakpt Jan 18, 2023
082fd34
Merge branch 'main' into gen_close
eendebakpt Feb 1, 2023
5efbf95
Merge branch 'main' into gen_close
eendebakpt May 9, 2023
8df595b
Merge branch 'main' into gen_close
eendebakpt May 9, 2023
dbc8398
Merge branch 'gen_close' of github.com:eendebakpt/cpython into gen_close
eendebakpt May 9, 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
4 changes: 2 additions & 2 deletions Objects/genobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,8 @@ gen_close(PyGenObject *gen, PyObject *args)
PyErr_SetString(PyExc_RuntimeError, msg);
return NULL;
}
if (PyErr_ExceptionMatches(PyExc_StopIteration)
|| PyErr_ExceptionMatches(PyExc_GeneratorExit)) {
if (PyErr_ExceptionMatches(PyExc_GeneratorExit)
|| PyErr_ExceptionMatches(PyExc_StopIteration)) {
PyErr_Clear(); /* ignore these errors */
Py_RETURN_NONE;
}
Expand Down