[Python-checkins] cpython (merge 3.2 -> 3.3): #17255: merge with 3.2.
ezio.melotti
python-checkins at python.org
Thu Feb 21 22:17:52 CET 2013
http://hg.python.org/cpython/rev/576d2c885eb6
changeset: 82306:576d2c885eb6
branch: 3.3
parent: 82302:361ba6d4b7c9
parent: 82305:34b7240d678b
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Thu Feb 21 23:17:08 2013 +0200
summary:
#17255: merge with 3.2.
files:
Lib/test/test_builtin.py | 2 ++
Misc/ACKS | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -180,6 +180,7 @@
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 @@
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]
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -423,6 +423,7 @@
Michael Gilfix
Yannick Gingras
Matt Giuca
+Wim Glenn
Michael Goderbauer
Christoph Gohlke
Tim Golden
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list