diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-08-30 06:23:17 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <rhettinger@users.noreply.github.com> | 2019-08-30 06:23:17 (GMT) |
| commit | 27f418640cf39c035114f29cc2d628775b43c0f9 (patch) | |
| tree | 6bf1a6b4b86e034785f240a677da6590c8d4697f /Lib/test/test_builtin.py | |
| parent | c19d6bca5577547b3f4624d99b5f5f1db3e5e695 (diff) | |
| download | cpython-27f418640cf39c035114f29cc2d628775b43c0f9.zip cpython-27f418640cf39c035114f29cc2d628775b43c0f9.tar.gz cpython-27f418640cf39c035114f29cc2d628775b43c0f9.tar.bz2 | |
bpo-37976: Prevent shadowing of TypeError in zip() (GH-15592) (GH-15608)
(cherry picked from commit 6a650aaf7735e30636db2721247f317064c2cfd4)
Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>
Diffstat (limited to 'Lib/test/test_builtin.py')
| -rw-r--r-- | Lib/test/test_builtin.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 6115579..1100c49 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -1477,6 +1477,18 @@ class BuiltinTest(unittest.TestCase): z1 = zip(a, b) self.check_iter_pickle(z1, t, proto) + def test_zip_bad_iterable(self): + exception = TypeError() + + class BadIterable: + def __iter__(self): + raise exception + + with self.assertRaises(TypeError) as cm: + zip(BadIterable()) + + self.assertIs(cm.exception, exception) + def test_format(self): # Test the basic machinery of the format() builtin. Don't test # the specifics of the various formatters |