python · vstinner · Jun 19, 2020 · vstinner · Jun 19, 2020 · gvanrossum
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
+    }
+    if (i) {
+        PyErr_Clear();
+        return PyErr_Format(PyExc_ValueError, "%s() argument %d is too short",
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-06-17-10-27-17.bpo-40636.MYaCIe.rst b/Misc/NEWS.d/next/Core and Builtins/2020-06-17-10-27-17.bpo-40636.MYaCIe.rst
@@ -0,0 +1,3 @@
+:func:`zip` now supports :pep:`618`'s ``strict`` parameter, which raises a
+:exc:`ValueError` if the arguments are exhausted at differing lengths.
-:exc:`ValueError` if the arguments are exhausted at differing lengths.
+:exc:`ValueError` if the arguments are exhausted at different lengths.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
                return NULL;
            }
            PyTuple_SET_ITEM(result, i, item);
        }
    }
    return result;
+check:
+    if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_StopIteration)) {
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
                return NULL;
            }
            PyTuple_SET_ITEM(result, i, item);
        }
    }
    return result;
+check:
+    if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_StopIteration)) {
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
+                                i + 1, plural, i);
+        }
+        if (PyErr_Occurred()) {
+            return NULL;
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
+
+    def test_zip_strict_error_handling(self):
+
+        class E(Exception):
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
+    if (i) {
+        // ValueError: zip() argument 2 is shorter than argument 1
+        // ValueError: zip() argument 3 is shorter than arguments 1-2
+        const char* plural = i == 1 ? " " : "s 1-";  //         ^^^^
-        const char* plural = i == 1 ? " " : "s 1-";  //         ^^^^
+        const char* plural = i == 1 ? " " : "s 1-";
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
+                    raise E
+                return self.size
+
+        l1 = self.iter_error(zip("AB", I(1), strict=True), E)
		@@ -0,0 +1,3 @@
		:func:`zip` now supports :pep:`618`'s ``strict`` parameter, which raises a
		:exc:`ValueError` if the arguments are exhausted at differing lengths.

		def test_zip_strict_error_handling(self):

		class E(Exception):
	const char* plural = i == 1 ? " " : "s 1-"; // ^^^^
	const char* plural = i == 1 ? " " : "s 1-";