summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_string.py
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 /Lib/test/test_string.py
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 'Lib/test/test_string.py')
-rw-r--r--Lib/test/test_string.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index d80c3b6..fdd431d 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -51,6 +51,17 @@ class StringTest(
self.checkraises(TypeError, string_tests.BadSeq1(), 'join', ' ')
self.checkequal('a b c', string_tests.BadSeq2(), 'join', ' ')
+ try:
+ def f():
+ yield 4 + ""
+ self.fixtype(' ').join(f())
+ except TypeError, e:
+ if '+' not in str(e):
+ self.fail('join() ate exception message')
+ else:
+ self.fail('exception not raised')
+
+
class ModuleTest(unittest.TestCase):