diff Python/ceval.c @ 41257:08d16183a9c1 2.5

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)
author Georg Brandl <georg@python.org>
date Wed, 21 Mar 2007 09:00:55 +0000
parents 891c28d53569
children 82f2791b7c02
line wrap: on
line diff
--- a/Python/ceval.c	Tue Mar 20 21:45:04 2007 +0000
+++ b/Python/ceval.c	Wed Mar 21 09:00:55 2007 +0000
@@ -1765,12 +1765,10 @@
 					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);