[Python-checkins] GH-90829: Fix empty iterable error message in min/max (#31181)
kumaraditya303
webhook-mailer at python.org
Sun Jan 8 08:51:25 EST 2023
https://github.com/python/cpython/commit/0741da8d28790cebe94a4392af37d63b1510080a
commit: 0741da8d28790cebe94a4392af37d63b1510080a
branch: main
author: Nnarol <lorand.l.juhasz at gmail.com>
committer: kumaraditya303 <59607654+kumaraditya303 at users.noreply.github.com>
date: 2023-01-08T19:21:20+05:30
summary:
GH-90829: Fix empty iterable error message in min/max (#31181)
files:
M Lib/test/test_builtin.py
M Python/bltinmodule.c
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index c65600483258..9e19af0ae90f 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -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
@@ -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
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 599cc18361ac..f97dd67269a2 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -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
More information about the Python-checkins
mailing list