Applying review comments and fixing some issues.

Author: petyaslavova

redis/asyncio/sentinel.py

@@ -224,28 +224,31 @@ async def execute_command(self, *args, **kwargs):
         once - If set to True, then execute the resulting command on a single
                node at random, rather than across the entire sentinel cluster.
         """
-        once = bool(kwargs.get("once", False))
-        if "once" in kwargs.keys():
-            kwargs.pop("once")
+        once = bool(kwargs.pop("once", False))
 
-        # Check if command suppose to return boolean response.
-        bool_resp = bool(kwargs.get("bool_resp", False))
-        if "bool_resp" in kwargs.keys():
-            kwargs.pop("bool_resp")
+        # Check if command is supposed to return the original
+        # responces instead of boolean value.
+        return_responses = bool(kwargs.pop("return_responses", False))
 
         if once:
-            return await random.choice(self.sentinels).execute_command(*args, **kwargs)
+            response = await random.choice(self.sentinels).execute_command(
+                *args, **kwargs
+            )
+            if return_responses:
+                return [response]
+            else:
+                return True if response else False
 
         tasks = [
             asyncio.Task(sentinel.execute_command(*args, **kwargs))
             for sentinel in self.sentinels
         ]
         responses = await asyncio.gather(*tasks)
 
-        if bool_resp:
-            return reduce(lambda x, y: x and y, responses)
+        if return_responses:
+            return responses
 
-        return responses
+        return reduce(lambda x, y: x and y, responses)
 
     def __repr__(self):
         sentinel_addresses = []

redis/commands/sentinel.py

@@ -14,38 +14,55 @@ def sentinel(self, *args):
     def sentinel_get_master_addr_by_name(self, service_name):
         """Returns a (host, port) pair for the given ``service_name``"""
         return self.execute_command(
-            "SENTINEL GET-MASTER-ADDR-BY-NAME", service_name, once=True
+            "SENTINEL GET-MASTER-ADDR-BY-NAME",
+            service_name,
+            once=True,
+            return_responses=True,
         )
 
     def sentinel_master(self, service_name):
         """Returns a dictionary containing the specified masters state."""
-        return self.execute_command("SENTINEL MASTER", service_name)
+        return self.execute_command(
+            "SENTINEL MASTER", service_name, return_responses=True
+        )
 
     def sentinel_masters(self):
-        """Returns a list of dictionaries containing each master's state."""
-        return self.execute_command("SENTINEL MASTERS", once=True)
+        """
+        Returns a list of dictionaries containing each master's state.
+
+        Important: This function is called by the Sentinel implementation and is
+        called directly on the Redis standalone client for sentinels,
+        so it doesn'tsupport the "once" and "return_responses" options.
+        """
+        return self.execute_command("SENTINEL MASTERS")
 
     def sentinel_monitor(self, name, ip, port, quorum):
         """Add a new master to Sentinel to be monitored"""
-        return self.execute_command(
-            "SENTINEL MONITOR", name, ip, port, quorum, bool_resp=True
-        )
+        return self.execute_command("SENTINEL MONITOR", name, ip, port, quorum)
 
     def sentinel_remove(self, name):
         """Remove a master from Sentinel's monitoring"""
-        return self.execute_command("SENTINEL REMOVE", name, bool_resp=True)
+        return self.execute_command("SENTINEL REMOVE", name)
 
     def sentinel_sentinels(self, service_name):
         """Returns a list of sentinels for ``service_name``"""
-        return self.execute_command("SENTINEL SENTINELS", service_name)
+        return self.execute_command(
+            "SENTINEL SENTINELS", service_name, return_responses=True
+        )
 
     def sentinel_set(self, name, option, value):
         """Set Sentinel monitoring parameters for a given master"""
-        return self.execute_command("SENTINEL SET", name, option, value, bool_resp=True)
+        return self.execute_command("SENTINEL SET", name, option, value)
 
     def sentinel_slaves(self, service_name):
-        """Returns a list of slaves for ``service_name``"""
-        return self.execute_command("SENTINEL SLAVES", service_name, once=True)
+        """
+        Returns a list of slaves for ``service_name``
+
+        Important: This function is called by the Sentinel implementation and is
+        called directly on the Redis standalone client for sentinels,
+        so it doesn'tsupport the "once" and "return_responses" options.
+        """
+        return self.execute_command("SENTINEL SLAVES", service_name)
 
     def sentinel_reset(self, pattern):
         """
@@ -56,9 +73,7 @@ def sentinel_reset(self, pattern):
         failover in progress), and removes every slave and sentinel already
         discovered and associated with the master.
         """
-        return self.execute_command(
-            "SENTINEL RESET", pattern, once=True, bool_resp=True
-        )
+        return self.execute_command("SENTINEL RESET", pattern, once=True)
 
     def sentinel_failover(self, new_master_name):
         """
@@ -67,9 +82,7 @@ def sentinel_failover(self, new_master_name):
         configuration will be published so that the other Sentinels will
         update their configurations).
         """
-        return self.execute_command(
-            "SENTINEL FAILOVER", new_master_name, bool_resp=True
-        )
+        return self.execute_command("SENTINEL FAILOVER", new_master_name)
 
     def sentinel_ckquorum(self, new_master_name):
         """
@@ -80,9 +93,7 @@ def sentinel_ckquorum(self, new_master_name):
         This command should be used in monitoring systems to check if a
         Sentinel deployment is ok.
         """
-        return self.execute_command(
-            "SENTINEL CKQUORUM", new_master_name, once=True, bool_resp=True
-        )
+        return self.execute_command("SENTINEL CKQUORUM", new_master_name, once=True)
 
     def sentinel_flushconfig(self):
         """
@@ -100,7 +111,7 @@ def sentinel_flushconfig(self):
         This command works even if the previous configuration file is
         completely missing.
         """
-        return self.execute_command("SENTINEL FLUSHCONFIG", bool_resp=True)
+        return self.execute_command("SENTINEL FLUSHCONFIG")
 
 
 class AsyncSentinelCommands(SentinelCommands):

redis/sentinel.py

@@ -255,26 +255,27 @@ def execute_command(self, *args, **kwargs):
         once - If set to True, then execute the resulting command on a single
         node at random, rather than across the entire sentinel cluster.
         """
-        once = bool(kwargs.get("once", False))
-        if "once" in kwargs.keys():
-            kwargs.pop("once")
+        once = bool(kwargs.pop("once", False))
 
-        # Check if command suppose to return boolean response.
-        bool_resp = bool(kwargs.get("bool_resp", False))
-        if "bool_resp" in kwargs.keys():
-            kwargs.pop("bool_resp")
+        # Check if command is supposed to return the original
+        # responces instead of boolean value.
+        return_responses = bool(kwargs.pop("return_responses", False))
 
         if once:
-            return random.choice(self.sentinels).execute_command(*args, **kwargs)
+            response = random.choice(self.sentinels).execute_command(*args, **kwargs)
+            if return_responses:
+                return [response]
+            else:
+                return True if response else False
 
         responses = []
         for sentinel in self.sentinels:
             responses.append(sentinel.execute_command(*args, **kwargs))
 
-        if bool_resp:
-            return reduce(lambda x, y: x and y, responses)
+        if return_responses:
+            return responses
 
-        return responses
+        return reduce(lambda x, y: x and y, responses)
 
     def __repr__(self):
         sentinel_addresses = []