Skip to content

gh-146102: Don't clear exception on success in odictobject.c #151347

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

Open
vstinner wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −1
Open

gh-146102: Don't clear exception on success in odictobject.c #151347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Objects/odictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2206,13 +2206,14 @@ update __setitem__
static int
mutablemapping_add_pairs(PyObject *self, PyObject *pairs)
{
assert(!PyErr_Occurred());

PyObject *pair, *iterator, *unexpected;
int res = 0;

iterator = PyObject_GetIter(pairs);
if (iterator == NULL)
return -1;
PyErr_Clear();

while ((pair = PyIter_Next(iterator)) != NULL) {
/* could be more efficient (see UNPACK_SEQUENCE in ceval.c) */
Expand Down
Loading