]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
GH-90829: Fix empty iterable error message in min/max (#31181)
authorNnarol <lorand.l.juhasz@gmail.com>
Sun, 8 Jan 2023 13:51:20 +0000 (14:51 +0100)
committerGitHub <noreply@github.com>
Sun, 8 Jan 2023 13:51:20 +0000 (19:21 +0530)
Lib/test/test_builtin.py
Python/bltinmodule.c

index c65600483258a790cdde69223d2150749e61bcc6..9e19af0ae90fc1b3d82f3f09213bbe5d637cccf2 100644 (file)
@@ -1155,7 +1155,11 @@ class BuiltinTest(unittest.TestCase):
             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 @@ class BuiltinTest(unittest.TestCase):
             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
index 599cc18361ac054e6ba36f0d0d3fc1be431bf31f..f97dd67269a270c8bfdeae880d184029dee0fa4f 100644 (file)
@@ -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