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

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Sep  7 00:43:39 2009
New Revision: 74699

Log:
PyObject_GetIter can set an error for its self just fine

Modified:
   python/trunk/Python/bltinmodule.c

Modified: python/trunk/Python/bltinmodule.c
==============================================================================
--- python/trunk/Python/bltinmodule.c	(original)
+++ python/trunk/Python/bltinmodule.c	Mon Sep  7 00:43:39 2009
@@ -968,14 +968,8 @@
 		/* Get iterator. */
 		curseq = PyTuple_GetItem(args, i+1);
 		sqp->it = PyObject_GetIter(curseq);
-		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);
+		if (sqp->it == NULL)
 			goto Fail_2;
-		}
 
 		/* Update len. */
 		curlen = _PyObject_LengthHint(curseq, 8);
@@ -2463,13 +2457,8 @@
 	for (i = 0; i < itemsize; ++i) {
 		PyObject *item = PyTuple_GET_ITEM(args, i);
 		PyObject *it = PyObject_GetIter(item);
-		if (it == NULL) {
-			if (PyErr_ExceptionMatches(PyExc_TypeError))
-				PyErr_Format(PyExc_TypeError,
-				    "zip argument #%zd must support iteration",
-				    i+1);
+		if (it == NULL)
 			goto Fail_ret_itlist;
-		}
 		PyTuple_SET_ITEM(itlist, i, it);
 	}