Index: Python/bltinmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v retrieving revision 2.271 diff -u -r2.271 bltinmodule.c --- Python/bltinmodule.c 25 Jan 2003 22:46:11 -0000 2.271 +++ Python/bltinmodule.c 28 Jan 2003 19:53:57 -0000 @@ -740,14 +740,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 = -1; /* unknown */ @@ -1391,8 +1385,6 @@ it = PyObject_GetIter(seq); if (it == NULL) { - PyErr_SetString(PyExc_TypeError, - "reduce() arg 2 must support iteration"); Py_XDECREF(result); return NULL; } @@ -1644,13 +1636,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 #%d must support iteration", - i+1); + if (it == NULL) goto Fail_ret_itlist; - } PyTuple_SET_ITEM(itlist, i, it); }