Added **kwargs to Redis' non key-based commands so they could be reused with target_nodes key word in RedisCluster. Removed duplicated commands from commands/cluster.py.

Author: barshaul

README.md

@@ -1046,7 +1046,7 @@ and attempt to retry executing the command.
     >>> rc.cluster_meet('127.0.0.1', 6379, target_nodes=Redis.ALL_NODES)
     >>> # ping all replicas
     >>> rc.ping(target_nodes=Redis.REPLICAS)
-    >>> # ping a specific node
+    >>> # ping a random node
     >>> rc.ping(target_nodes=Redis.RANDOM)
     >>> # get the keys from all cluster nodes
     >>> rc.keys(target_nodes=Redis.ALL_NODES)
@@ -1158,7 +1158,7 @@ readwrite() method.
     >>> from cluster import RedisCluster as Redis
     # Use 'debug' log level to print the node that the command is executed on
     >>> rc_readonly = Redis(startup_nodes=startup_nodes, 
-                    read_from_replicas=True, debug=True)
+                    read_from_replicas=True)
     >>> rc_readonly.set('{foo}1', 'bar1')
     >>> for i in range(0, 4):
             # Assigns read command to the slot's hosts in a Round-Robin manner

redis/client.py

@@ -920,6 +920,18 @@ def __init__(self, host='localhost', port=6379,
     def __repr__(self):
         return "%s<%s>" % (type(self).__name__, repr(self.connection_pool))
 
+    def get_encoder(self):
+        """
+        Get the connection pool's encoder
+        """
+        return self.connection_pool.get_encoder()
+
+    def get_connection_kwargs(self):
+        """
+        Get the connection's key-word arguments
+        """
+        return self.connection_pool.connection_kwargs
+
     def set_response_callback(self, command, callback):
         "Set a custom Response Callback"
         self.response_callbacks[command] = callback

redis/cluster.py

@@ -9,7 +9,7 @@
 from collections import OrderedDict
 from redis.client import CaseInsensitiveDict, Redis, PubSub
 from redis.commands import (
-    ClusterCommands,
+    RedisClusterCommands,
     CommandsParser
 )
 from redis.connection import DefaultParser, ConnectionPool, Encoder, parse_url
@@ -201,7 +201,7 @@ class ClusterParser(DefaultParser):
         })
 
 
-class RedisCluster(ClusterCommands, object):
+class RedisCluster(RedisClusterCommands, object):
     RedisClusterRequestTTL = 16
 
     PRIMARIES = "primaries"
@@ -789,6 +789,18 @@ def determine_slot(self, *args):
     def reinitialize_caches(self):
         self.nodes_manager.initialize()
 
+    def get_encoder(self):
+        """
+        Get the connections' encoder
+        """
+        return self.encoder
+
+    def get_connection_kwargs(self):
+        """
+        Get the connections' key-word arguments
+        """
+        return self.nodes_manager.connection_kwargs
+
     def _is_nodes_flag(self, target_nodes):
         return isinstance(target_nodes, str) \
             and target_nodes in self.node_flags

redis/commands/__init__.py

@@ -1,12 +1,12 @@
-from .cluster import ClusterCommands
+from .cluster import RedisClusterCommands
 from .core import CoreCommands
 from .helpers import list_or_args
 from .parser import CommandsParser
 from .redismodules import RedisModuleCommands
 from .sentinel import SentinelCommands
 
 __all__ = [
-    'ClusterCommands',
+    'RedisClusterCommands',
     'CommandsParser',
     'CoreCommands',
     'list_or_args',