Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into fix/ubsan/posix-111178
# Conflicts:
#	Modules/posixmodule.c
  • Loading branch information
picnixz committed Feb 7, 2025
commit b071d1256b5a248dcf96ecb244743739efbe25c7
3 changes: 2 additions & 1 deletion Modules/posixmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -16370,7 +16370,8 @@ ScandirIterator_finalize(PyObject *op)
{
/* Spurious errors can appear at shutdown */
if (PyErr_ExceptionMatches(PyExc_Warning)) {
PyErr_WriteUnraisable(op);
PyErr_FormatUnraisable("Exception ignored while finalizing "
"scandir iterator %R", iterator);
}
}
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.