traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-39816: More descriptive error msg than "too many values to unpack"

This commit is contained in:
Zackery Spytz 2020-03-16 23:42:14 -06:00
parent 6ff79f6582
commit 6e7716ca11
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/test/test_unpack.py
View File

@ -62,28 +62,28 @@ Unpacking tuple of wrong size
>>> a, b = t
Traceback (most recent call last):
...
ValueError: too many values to unpack (expected 2)
ValueError: too many values to unpack (expected 2) from object of type 'tuple'
Unpacking tuple of wrong size
Unpacking list of wrong size
>>> a, b = l
Traceback (most recent call last):
...
ValueError: too many values to unpack (expected 2)
ValueError: too many values to unpack (expected 2) from object of type 'list'
Unpacking sequence too short
>>> a, b, c, d = Seq()
Traceback (most recent call last):
...
ValueError: not enough values to unpack (expected 4, got 3)
ValueError: not enough values to unpack (expected 4, got 3) from object of type 'Seq'
Unpacking sequence too long
>>> a, b = Seq()
Traceback (most recent call last):
...
ValueError: too many values to unpack (expected 2)
ValueError: too many values to unpack (expected 2) from object of type 'Seq'
Unpacking a sequence where the test for too long raises a different kind of
error
@ -136,7 +136,7 @@ Unpacking to an empty iterable should raise ValueError
>>> () = [42]
Traceback (most recent call last):
...
ValueError: too many values to unpack (expected 0)
ValueError: too many values to unpack (expected 0) from object of type 'list'
"""

4
Lib/test/test_unpack_ex.py
View File

@ -270,14 +270,14 @@ Unpacking sequence too short
>>> a, *b, c, d, e = Seq()
Traceback (most recent call last):
...
ValueError: not enough values to unpack (expected at least 4, got 3)
ValueError: not enough values to unpack (expected at least 4, got 3) from object of type 'Seq'
Unpacking sequence too short and target appears last
>>> a, b, c, d, *e = Seq()
Traceback (most recent call last):
...
ValueError: not enough values to unpack (expected at least 4, got 3)
ValueError: not enough values to unpack (expected at least 4, got 3) from object of type 'Seq'
Unpacking a sequence where the test for too long raises a different kind of
error

21
Python/ceval.c
View File

@ -4387,14 +4387,17 @@ unpack_iterable(PyThreadState *tstate, PyObject *v,
if (argcntafter == -1) {
_PyErr_Format(tstate, PyExc_ValueError,
"not enough values to unpack "
"(expected %d, got %d)",
argcnt, i);
"(expected %d, got %d) from object of type "
"'%.200s'",
argcnt, i, Py_TYPE(v)->tp_name);
}
else {
_PyErr_Format(tstate, PyExc_ValueError,
"not enough values to unpack "
"(expected at least %d, got %d)",
argcnt + argcntafter, i);
"(expected at least %d, got %d) from "
"object of type '%.200s'",
argcnt + argcntafter, i,
Py_TYPE(v)->tp_name);
}
}
goto Error;
@ -4413,8 +4416,9 @@ unpack_iterable(PyThreadState *tstate, PyObject *v,
}
Py_DECREF(w);
_PyErr_Format(tstate, PyExc_ValueError,
"too many values to unpack (expected %d)",
argcnt);
"too many values to unpack (expected %d) from object "
"of type '%.200s'",
argcnt, Py_TYPE(v)->tp_name);
goto Error;
}
@ -4427,8 +4431,9 @@ unpack_iterable(PyThreadState *tstate, PyObject *v,
ll = PyList_GET_SIZE(l);
if (ll < argcntafter) {
_PyErr_Format(tstate, PyExc_ValueError,
"not enough values to unpack (expected at least %d, got %zd)",
argcnt + argcntafter, argcnt + ll);
"not enough values to unpack (expected at least %d, got %zd) "
"from object of type '%.200s'",
argcnt + argcntafter, argcnt + ll, Py_TYPE(v)->tp_name);
goto Error;
}