[Python-checkins] r72517 - python/trunk/Python/bltinmodule.c

Sat May 9 21:18:26 CEST 2009

Author: benjamin.peterson
Date: Sat May 9 21:17:59 2009
New Revision: 72517
Log:
don't ignore exceptions from _PyObject_LengthHint
Modified:
 python/trunk/Python/bltinmodule.c
Modified: python/trunk/Python/bltinmodule.c
==============================================================================

--- python/trunk/Python/bltinmodule.c	(original)
+++ python/trunk/Python/bltinmodule.c	Sat May 9 21:17:59 2009
@@ -2383,8 +2383,10 @@
 	len = -1;	/* unknown */
 	for (i = 0; i < itemsize; ++i) {
 		PyObject *item = PyTuple_GET_ITEM(args, i);
-		Py_ssize_t thislen = _PyObject_LengthHint(item, -1);
+		Py_ssize_t thislen = _PyObject_LengthHint(item, -2);
 		if (thislen < 0) {
+			if (thislen == -1)
+				return NULL;
 			len = -1;
 			break;
 		}
