Skip to content

GH-90829: Fix empty iterable error message in min/max #31181

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.

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
Show file tree
Hide file tree
Changes from all commits
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
12 changes: 10 additions & 2 deletions Lib/test/test_builtin.py
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,11 @@ def test_max(self):
max()

self.assertRaises(TypeError, max, 42)
self.assertRaises(ValueError, max, ())
with self.assertRaisesRegex(
ValueError,
r'max\(\) iterable argument is empty'
):
max(())
class BadSeq:
def __getitem__(self, index):
raise ValueError
Expand Down Expand Up @@ -1214,7 +1218,11 @@ def test_min(self):
min()

self.assertRaises(TypeError, min, 42)
self.assertRaises(ValueError, min, ())
with self.assertRaisesRegex(
ValueError,
r'min\(\) iterable argument is empty'
):
min(())
class BadSeq:
def __getitem__(self, index):
raise ValueError
Expand Down
2 changes: 1 addition & 1 deletion Python/bltinmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1814,7 +1814,7 @@ min_max(PyObject *args, PyObject *kwds, int op)
maxitem = Py_NewRef(defaultval);
} else {
PyErr_Format(PyExc_ValueError,
"%s() arg is an empty sequence", name);
"%s() iterable argument is empty", name);
}
}
else
Expand Down