From 284c69f03fb5d6f2ce9202f64ff2f6de7e82ddc3 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 22 Mar 2010 15:03:21 +0000
Subject: [PATCH] Revert "Only override any and all if not defined"

This reverts commit bd5617020a50bcd08269330638d64078c1b30b71.

Turns out our and python's any/all are not compatible.

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 lib/utils.py | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/utils.py b/lib/utils.py
index ee85f946e..07bdc0e45 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -1477,24 +1477,18 @@ def FirstFree(seq, base=0):
   return None
 
 
-try:
-  all = all # pylint: disable-msg=W0622
-except NameError:
-  def all(seq, pred=bool): # pylint: disable-msg=W0622
-    "Returns True if pred(x) is True for every element in the iterable"
-    for _ in itertools.ifilterfalse(pred, seq):
-      return False
-    return True
+def all(seq, pred=bool): # pylint: disable-msg=W0622
+  "Returns True if pred(x) is True for every element in the iterable"
+  for _ in itertools.ifilterfalse(pred, seq):
+    return False
+  return True
 
 
-try:
-  any = any # pylint: disable-msg=W0622
-except NameError:
-  def any(seq, pred=bool): # pylint: disable-msg=W0622
-    "Returns True if pred(x) is True for at least one element in the iterable"
-    for _ in itertools.ifilter(pred, seq):
-      return True
-    return False
+def any(seq, pred=bool): # pylint: disable-msg=W0622
+  "Returns True if pred(x) is True for at least one element in the iterable"
+  for _ in itertools.ifilter(pred, seq):
+    return True
+  return False
 
 
 def SingleWaitForFdCondition(fdobj, event, timeout):
-- 
GitLab