summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_builtin.py
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-08-16 19:46:32 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-08-16 19:46:32 (GMT)
commit7a9bdbc1c2214bec2133139dd8830f17e0383eed (patch)
treea332279d11accbf9106fb82bed646eaff4769773 /Lib/test/test_builtin.py
parent5b37ce64c1a8108406cd0ae19e15b9ebd855c2f6 (diff)
downloadcpython-7a9bdbc1c2214bec2133139dd8830f17e0383eed.zip
cpython-7a9bdbc1c2214bec2133139dd8830f17e0383eed.tar.gz
cpython-7a9bdbc1c2214bec2133139dd8830f17e0383eed.tar.bz2
Merged revisions 84098 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84098 | alexander.belopolsky | 2010-08-16 14:55:46 -0400 (Mon, 16 Aug 2010) | 4 lines Issue #665761: functools.reduce() will no longer mask exceptions other than TypeError raised by the iterator argument. Also added a test to check that zip() already behaves similarly. ........
Diffstat (limited to 'Lib/test/test_builtin.py')
-rw-r--r--Lib/test/test_builtin.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 34c2bb1..2a08337 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1221,6 +1221,7 @@ class BuiltinTest(unittest.TestCase):
class G:
pass
self.assertRaises(TypeError, zip, a, G())
+ self.assertRaises(RuntimeError, zip, a, TestFailingIter())
# Make sure zip doesn't try to allocate a billion elements for the
# result list when one of its arguments doesn't say how long it is.