From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 7 Sep 2009 13:02:15 +0000 (+0000)
Subject: revert r74699 since it loses useful error information
X-Git-Tag: v2.7a1~571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d692a71fddbbc8cebabf260e7d11e113cff4f73e;p=python

revert r74699 since it loses useful error information
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index b1b1e8e140..1f25d5d208 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -968,8 +968,14 @@ builtin_map(PyObject *self, PyObject *args)
 		/* Get iterator. */
 		curseq = PyTuple_GetItem(args, i+1);
 		sqp->it = PyObject_GetIter(curseq);
-		if (sqp->it == NULL)
+		if (sqp->it == NULL) {
+			static char errmsg[] =
+			    "argument %d to map() must support iteration";
+			char errbuf[sizeof(errmsg) + 25];
+			PyOS_snprintf(errbuf, sizeof(errbuf), errmsg, i+2);
+			PyErr_SetString(PyExc_TypeError, errbuf);
 			goto Fail_2;
+		}
 
 		/* Update len. */
 		curlen = _PyObject_LengthHint(curseq, 8);
@@ -2457,8 +2463,13 @@ builtin_zip(PyObject *self, PyObject *args)
 	for (i = 0; i < itemsize; ++i) {
 		PyObject *item = PyTuple_GET_ITEM(args, i);
 		PyObject *it = PyObject_GetIter(item);
-		if (it == NULL)
+		if (it == NULL) {
+			if (PyErr_ExceptionMatches(PyExc_TypeError))
+				PyErr_Format(PyExc_TypeError,
+				    "zip argument #%zd must support iteration",
+				    i+1);
 			goto Fail_ret_itlist;
+		}
 		PyTuple_SET_ITEM(itlist, i, it);
 	}