diff -r bf1054051c5b Python/ceval.c
--- a/Python/ceval.c	Tue Apr 14 15:38:25 2015 -0400
+++ b/Python/ceval.c	Tue Apr 14 15:39:03 2015 -0400
@@ -3826,8 +3826,8 @@
             /* Iterator done, via error or exhaustion. */
             if (!PyErr_Occurred()) {
                 PyErr_Format(PyExc_ValueError,
-                    "need more than %d value%s to unpack",
-                    i, i == 1 ? "" : "s");
+                    "not enough values to unpack (expected %d, got %d)",
+                    argcnt, i);
             }
             goto Error;
         }
@@ -3844,8 +3844,9 @@
             return 1;
         }
         Py_DECREF(w);
-        PyErr_Format(PyExc_ValueError, "too many values to unpack "
-                     "(expected %d)", argcnt);
+        PyErr_Format(PyExc_ValueError,
+            "too many values to unpack (expected %d)",
+            argcnt);
         goto Error;
     }