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 /Lib/test/string_tests.py | |
| 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 'Lib/test/string_tests.py')
| -rw-r--r-- | Lib/test/string_tests.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 9f092b9..60f5fdb 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -657,6 +657,15 @@ class MixinStrUnicodeUserStringTest: self.checkraises(TypeError, ' ', 'join') self.checkraises(TypeError, ' ', 'join', 7) self.checkraises(TypeError, ' ', 'join', Sequence([7, 'hello', 123L])) + 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') def test_formatting(self): self.checkequal('+hello+', '+%s+', '__mod__', 'hello') |