From 50d747e5f6e1c8c88c2dc5a56dd80f0f596240a3 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Wed, 21 Mar 2007 09:00:55 +0000 Subject: Patch #1682205: a TypeError while unpacking an iterable is no longer masked by a generic one with the message "unpack non-sequence". (backport from rev. 54480) --- Python/ceval.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Python') diff --git a/Python/ceval.c b/Python/ceval.c index 690b2be9b7..9dddd2ff2f 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1765,12 +1765,10 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) PUSH(w); } } else if (unpack_iterable(v, oparg, - stack_pointer + oparg)) + stack_pointer + oparg)) { stack_pointer += oparg; - else { - if (PyErr_ExceptionMatches(PyExc_TypeError)) - PyErr_SetString(PyExc_TypeError, - "unpack non-sequence"); + } else { + /* unpack_iterable() raised an exception */ why = WHY_EXCEPTION; } Py_DECREF(v); -- cgit v1.2.1