fix issue when having ssl=False

Grokzen · Jan 8, 2019 · 4a499a9 · 4a499a9
1 parent 3842199
commit 4a499a9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/rediscluster/client.py b/rediscluster/client.py
@@ -161,7 +161,7 @@ def __init__(self, host=None, port=None, startup_nodes=None, max_connections=Non
         if "db" in kwargs:
             raise RedisClusterException("Argument 'db' is not possible to use in cluster mode")
 
-        if kwargs.get('ssl', False):
+        if kwargs.pop('ssl', False):  # Needs to be removed to avoid exception in redis Connection init
             connection_class = SSLClusterConnection
 
         if "connection_pool" in kwargs:

diff --git a/rediscluster/connection.py b/rediscluster/connection.py
@@ -71,7 +71,6 @@ class SSLClusterConnection(SSLConnection):
     def __init__(self, **kwargs):
         self.readonly = kwargs.pop('readonly', False)
         kwargs['parser_class'] = ClusterParser
-        kwargs.pop('ssl', None)  # Needs to be removed to avoid exception in redis Connection init
         super(SSLClusterConnection, self).__init__(**kwargs)
 
     def on_connect(self):