mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Patch #1682205: a TypeError while unpacking an iterable is no longer

Browse source 
masked by a generic one with the message "unpack non-sequence".
 (backport from rev. 54480)
This commit is contained in:
Georg Brandl 2007-03-21 09:00:55 +00:00
parent f94e89c578
commit 8a10ea4613
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_unpack.py
View file

@ -55,7 +55,7 @@ Unpacking non-sequence
>>> a, b, c = 7 >>> a, b, c = 7
Traceback (most recent call last): Traceback (most recent call last):
... ...
TypeError: unpack non-sequence TypeError: 'int' object is not iterable
Unpacking tuple of wrong size Unpacking tuple of wrong size

3
Misc/NEWS
View file

@ -12,6 +12,9 @@ What's New in Python 2.5.1c1?
Core and builtins Core and builtins
----------------- -----------------
- Patch #1682205: a TypeError while unpacking an iterable is no longer
masked by a generic one with the message "unpack non-sequence".
- Patch #1642547: Fix an error/crash when encountering syntax errors in - Patch #1642547: Fix an error/crash when encountering syntax errors in
complex if statements. complex if statements.

8
Python/ceval.c
View file

@ -1765,12 +1765,10 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
PUSH(w); PUSH(w);
} }
} else if (unpack_iterable(v, oparg, } else if (unpack_iterable(v, oparg,
stack_pointer + oparg)) stack_pointer + oparg)) {
stack_pointer += oparg; stack_pointer += oparg;
else { } else {
if (PyErr_ExceptionMatches(PyExc_TypeError)) /* unpack_iterable() raised an exception */
PyErr_SetString(PyExc_TypeError,
"unpack non-sequence");
why = WHY_EXCEPTION; why = WHY_EXCEPTION;
} }
Py_DECREF(v); Py_DECREF(v);