From dbe3d280e70c8a2a5542839a118333d645192b79 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Sun, 5 Oct 2003 16:47:36 +0000 Subject: Adopt Christian Stork's suggested argument order for the logic quantifiers. Adopt Jeremy Fincher's suggested function name, "any", instead of "some". --- Doc/lib/libitertools.tex | 8 ++++---- Lib/test/test_itertools.py | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Doc/lib/libitertools.tex b/Doc/lib/libitertools.tex index 3b70546..30d80c1 100644 --- a/Doc/lib/libitertools.tex +++ b/Doc/lib/libitertools.tex @@ -344,19 +344,19 @@ def nth(iterable, n): "Returns the nth item" return list(islice(iterable, n, n+1)) -def all(pred, seq): +def all(seq, pred=bool): "Returns True if pred(x) is True for every element in the iterable" return False not in imap(pred, seq) -def some(pred, seq): +def any(seq, pred=bool): "Returns True if pred(x) is True at least one element in the iterable" return True in imap(pred, seq) -def no(pred, seq): +def no(seq, pred=bool): "Returns True if pred(x) is False for every element in the iterable" return True not in imap(pred, seq) -def quantify(pred, seq): +def quantify(seq, pred=bool): "Count how many times the predicate is True in the sequence" return sum(imap(pred, seq)) diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py index 7842dd3..0880be3 100644 --- a/Lib/test/test_itertools.py +++ b/Lib/test/test_itertools.py @@ -504,19 +504,19 @@ Samuele ... "Returns the nth item" ... return list(islice(iterable, n, n+1)) ->>> def all(pred, seq): +>>> def all(seq, pred=bool): ... "Returns True if pred(x) is True for every element in the iterable" ... return False not in imap(pred, seq) ->>> def some(pred, seq): +>>> def any(seq, pred=bool): ... "Returns True if pred(x) is True for at least one element in the iterable" ... return True in imap(pred, seq) ->>> def no(pred, seq): +>>> def no(seq, pred=bool): ... "Returns True if pred(x) is False for every element in the iterable" ... return True not in imap(pred, seq) ->>> def quantify(pred, seq): +>>> def quantify(seq, pred=bool): ... "Count how many times the predicate is True in the sequence" ... return sum(imap(pred, seq)) @@ -571,25 +571,25 @@ perform as purported. >>> nth('abcde', 3) ['d'] ->>> all(lambda x: x%2==0, [2, 4, 6, 8]) +>>> all([2, 4, 6, 8], lambda x: x%2==0) True ->>> all(lambda x: x%2==0, [2, 3, 6, 8]) +>>> all([2, 3, 6, 8], lambda x: x%2==0) False ->>> some(lambda x: x%2==0, [2, 4, 6, 8]) +>>> any([2, 4, 6, 8], lambda x: x%2==0) True ->>> some(lambda x: x%2==0, [1, 3, 5, 9]) +>>> any([1, 3, 5, 9], lambda x: x%2==0,) False ->>> no(lambda x: x%2==0, [1, 3, 5, 9]) +>>> no([1, 3, 5, 9], lambda x: x%2==0) True ->>> no(lambda x: x%2==0, [1, 2, 5, 9]) +>>> no([1, 2, 5, 9], lambda x: x%2==0) False ->>> quantify(lambda x: x%2==0, xrange(99)) +>>> quantify(xrange(99), lambda x: x%2==0) 50 >>> list(window('abc')) -- cgit v0.12