diff options
| author | Michael W. Hudson <mwh@python.net> | 2005-10-21 11:45:01 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2005-10-21 11:45:01 (GMT) |
| commit | b2308bb9be492937764a99007f5fd49b75fbefee (patch) | |
| tree | e62df0ddeff790c58c067130b61e9f9d43840783 /Objects/stringobject.c | |
| parent | aee2e2829db8e8d4ea9f5b0bc900564cdebe9414 (diff) | |
| download | cpython-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/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 78560de..037fa6a 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; } |