From 6088d9954419055ebd2314070c7d3556bee89fb4 Mon Sep 17 00:00:00 2001 From: "Michael W. Hudson" Date: Fri, 21 Oct 2005 11:45:01 +0000 Subject: Fix bug: [ 1327110 ] wrong TypeError traceback in generator expressions by removing the code that can stomp on the users' TypeError raised by the iterable argument to ''.join() -- PySequence_Fast (now?) gives a perfectly reasonable message itself. Also, a couple of tests. --- Objects/stringobject.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Objects/stringobject.c') diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 78560de9d6..037fa6a239 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1620,10 +1620,6 @@ string_join(PyStringObject *self, PyObject *orig) seq = PySequence_Fast(orig, ""); if (seq == NULL) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) - PyErr_Format(PyExc_TypeError, - "sequence expected, %.80s found", - orig->ob_type->tp_name); return NULL; } -- cgit v1.2.1