summaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_builtin.py3
-rw-r--r--Lib/test/test_iter.py5
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 3dd2ffc7f3..65dabb159a 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1126,7 +1126,8 @@ class BuiltinTest(unittest.TestCase):
if i < 0 or i > 2: raise IndexError
return i + 4
self.assertEqual(zip(a, I()), t)
- self.assertRaises(TypeError, zip)
+ self.assertEqual(zip(), [])
+ self.assertEqual(zip(*[]), [])
self.assertRaises(TypeError, zip, None)
class G:
pass
diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
index 383fce344a..f83de78ad6 100644
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -423,7 +423,10 @@ class TestCase(unittest.TestCase):
# Test zip()'s use of iterators.
def test_builtin_zip(self):
- self.assertRaises(TypeError, zip)
+ self.assertEqual(zip(), [])
+ self.assertEqual(zip(*[]), [])
+ self.assertEqual(zip(*[(1, 2), 'ab']), [(1, 'a'), (2, 'b')])
+
self.assertRaises(TypeError, zip, None)
self.assertRaises(TypeError, zip, range(10), 42)
self.assertRaises(TypeError, zip, range(10), zip)