summaryrefslogtreecommitdiffstats
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorMichael W. Hudson <mwh@python.net>2005-10-21 11:45:01 (GMT)
committerMichael W. Hudson <mwh@python.net>2005-10-21 11:45:01 (GMT)
commitb2308bb9be492937764a99007f5fd49b75fbefee (patch)
treee62df0ddeff790c58c067130b61e9f9d43840783 /Objects/unicodeobject.c
parentaee2e2829db8e8d4ea9f5b0bc900564cdebe9414 (diff)
downloadcpython-b2308bb9be492937764a99007f5fd49b75fbefee.zip
cpython-b2308bb9be492937764a99007f5fd49b75fbefee.tar.gz
cpython-b2308bb9be492937764a99007f5fd49b75fbefee.tar.bz2
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.
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 10ac80c..db2a690 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4148,10 +4148,6 @@ PyUnicode_Join(PyObject *separator, PyObject *seq)
fseq = PySequence_Fast(seq, "");
if (fseq == NULL) {
- if (PyErr_ExceptionMatches(PyExc_TypeError))
- PyErr_Format(PyExc_TypeError,
- "sequence expected, %.80s found",
- seq->ob_type->tp_name);
return NULL;
}