commit 0310a83e7f2cb7cdb94d5a1a737681119783c834
author Georg Brandl <georg@python.org> Sat Jul 10 10:32:36 2010 +0000
committer Georg Brandl <georg@python.org> Sat Jul 10 10:32:36 2010 +0000
tree e917b6589145aaa0372002c52a6b23a3bf60be87
parent 93eb42e805524cd1375deab520d6f4828e0a4f53

#3071: tell how many values were expected when unpacking too many.

Lib/test/test_unpack.py

diff --git a/Lib/test/test_unpack.py b/Lib/test/test_unpack.py
index b1531f3..b1c483d 100644
--- a/Lib/test/test_unpack.py
+++ b/Lib/test/test_unpack.py
@@ -62,14 +62,14 @@
     >>> a, b = t
     Traceback (most recent call last):
       ...
-    ValueError: too many values to unpack
+    ValueError: too many values to unpack (expected 2)
 
 Unpacking tuple of wrong size
 
     >>> a, b = l
     Traceback (most recent call last):
       ...
-    ValueError: too many values to unpack
+    ValueError: too many values to unpack (expected 2)
 
 Unpacking sequence too short
 
@@ -83,7 +83,7 @@
     >>> a, b = Seq()
     Traceback (most recent call last):
       ...
-    ValueError: too many values to unpack
+    ValueError: too many values to unpack (expected 2)
 
 Unpacking a sequence where the test for too long raises a different kind of
 error

Python/ceval.c

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;
     }