#3071: tell how many values were expected when unpacking too many.
diff --git a/Python/ceval.c b/Python/ceval.c
index 6e4911a..2d4b16a 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3464,7 +3464,8 @@
             return 1;
         }
         Py_DECREF(w);
-        PyErr_SetString(PyExc_ValueError, "too many values to unpack");
+        PyErr_Format(PyExc_ValueError, "too many values to unpack "
+                     "(expected %d)", argcnt);
         goto Error;
     }