diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-02-21 21:17:34 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-02-21 21:17:34 (GMT) |
| commit | 8a268b985ff9aa2c65fe0540f7a6ffea2265a963 (patch) | |
| tree | c02cb68b857019cd17076a904c82bea23ddac875 /Lib/test/test_builtin.py | |
| parent | 920007ad76f1a880e6784ddb97a5c6c99a19b9a9 (diff) | |
| parent | 600b71167e386de4a4259947935d14ac091c5741 (diff) | |
| download | cpython-8a268b985ff9aa2c65fe0540f7a6ffea2265a963.zip cpython-8a268b985ff9aa2c65fe0540f7a6ffea2265a963.tar.gz cpython-8a268b985ff9aa2c65fe0540f7a6ffea2265a963.tar.bz2 | |
#17255: merge with 3.3.
Diffstat (limited to 'Lib/test/test_builtin.py')
| -rw-r--r-- | Lib/test/test_builtin.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 668167e..f46f8d5 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -180,6 +180,7 @@ class BuiltinTest(unittest.TestCase): self.assertRaises(TypeError, all) # No args self.assertRaises(TypeError, all, [2, 4, 6], []) # Too many args self.assertEqual(all([]), True) # Empty iterator + self.assertEqual(all([0, TestFailingBool()]), False)# Short-circuit S = [50, 60] self.assertEqual(all(x > 42 for x in S), True) S = [50, 40, 60] @@ -194,6 +195,7 @@ class BuiltinTest(unittest.TestCase): self.assertRaises(TypeError, any) # No args self.assertRaises(TypeError, any, [2, 4, 6], []) # Too many args self.assertEqual(any([]), False) # Empty iterator + self.assertEqual(any([1, TestFailingBool()]), True) # Short-circuit S = [40, 60, 30] self.assertEqual(any(x > 42 for x in S), True) S = [10, 20, 30] |