From d9ae742a5590abb0abc6d467d12537813386d953 Mon Sep 17 00:00:00 2001
From: Ed Cranford <ed.cranford@rackspace.com>
Date: Mon, 10 Sep 2012 12:24:45 -0500
Subject: [PATCH] Any() and All() don't short-circuit.

---
 reddwarf/guestagent/db/models.py |  6 +++---
 reddwarf/guestagent/dbaas.py     |  6 +++---
 reddwarf/instance/models.py      |  6 +++---
 reddwarf/instance/views.py       | 12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/reddwarf/guestagent/db/models.py b/reddwarf/guestagent/db/models.py
index 6d94fde293..5950782a28 100644
--- a/reddwarf/guestagent/db/models.py
+++ b/reddwarf/guestagent/db/models.py
@@ -351,9 +351,9 @@ class MySQLUser(Base):
         self._databases = []
 
     def _is_valid(self, value):
-        if any([not value,
-                self.not_supported_chars.search(value),
-                string.find("%r" % value, "\\") != -1]):
+        if (not value or
+                self.not_supported_chars.search(value) or
+                string.find("%r" % value, "\\") != -1):
             return False
         else:
             return True
diff --git a/reddwarf/guestagent/dbaas.py b/reddwarf/guestagent/dbaas.py
index d9d571ccb1..c0690bc956 100644
--- a/reddwarf/guestagent/dbaas.py
+++ b/reddwarf/guestagent/dbaas.py
@@ -212,9 +212,9 @@ class MySqlAppStatus(object):
         True if MySQL app should be installed and attempts to ascertain
         its status won't result in nonsense.
         """
-        return all([self.status is not None,
-                    self.status != rd_models.ServiceStatuses.BUILDING,
-                    self.status != rd_models.ServiceStatuses.FAILED])
+        return (self.status is not None and
+                self.status != rd_models.ServiceStatuses.BUILDING and
+                self.status != rd_models.ServiceStatuses.FAILED)
 
     @property
     def _is_mysql_restarting(self):
diff --git a/reddwarf/instance/models.py b/reddwarf/instance/models.py
index 9d72203360..ca0c4d37f5 100644
--- a/reddwarf/instance/models.py
+++ b/reddwarf/instance/models.py
@@ -481,9 +481,9 @@ class Instance(BuiltInstance):
         """
         Raises exception if an instance action cannot currently be performed.
         """
-        if any([self.db_info.server_status != "ACTIVE",
-                self.db_info.task_status != InstanceTasks.NONE,
-                not self.service_status.status.action_is_allowed]):
+        if (self.db_info.server_status != "ACTIVE" or
+                self.db_info.task_status != InstanceTasks.NONE or
+                not self.service_status.status.action_is_allowed):
             msg = ("Instance is not currently available for an action to be "
                    "performed (status was %s).")
             LOG.error(msg % self.status)
diff --git a/reddwarf/instance/views.py b/reddwarf/instance/views.py
index f5ecf866e4..8596762533 100644
--- a/reddwarf/instance/views.py
+++ b/reddwarf/instance/views.py
@@ -25,13 +25,13 @@ LOG = logging.getLogger(__name__)
 
 
 def get_ip_address(addresses):
-    if all([addresses is not None,
-            addresses.get('private') is not None,
-            len(addresses['private']) > 0]):
+    if (addresses is not None and
+            addresses.get('private') is not None and
+            len(addresses['private']) > 0):
         return [addr.get('addr') for addr in addresses['private']]
-    if all([addresses is not None,
-            addresses.get('usernet') is not None,
-            len(addresses['usernet']) > 0]):
+    if (addresses is not None and
+            addresses.get('usernet') is not None and
+            len(addresses['usernet']) > 0):
         return [addr.get('addr') for addr in addresses['usernet']]