Remove timeout; keep IGNORE_CLUSTER_ERRORS within this backend

Author: hectcastro

django_elasticache/cluster_utils.py

@@ -17,7 +17,7 @@ def __init__(self, cmd, response):
             'Unexpected response {} for command {}'.format(response, cmd))
 
 
-def get_cluster_info(host, port, ignore_cluster_errors=False, timeout=3):
+def get_cluster_info(host, port, ignore_cluster_errors=False):
     """
     return dict with info about nodes in cluster and current version
     {
@@ -30,7 +30,7 @@ def get_cluster_info(host, port, ignore_cluster_errors=False, timeout=3):
     """
     client = Telnet(host, int(port))
     client.write(b'version\n')
-    res = client.read_until(b'\r\n', timeout).strip()
+    res = client.read_until(b'\r\n').strip()
     version_list = res.split(b' ')
     if len(version_list) not in [2, 3] or version_list[0] != b'VERSION':
         raise WrongProtocolData('version', res)
@@ -43,7 +43,7 @@ def get_cluster_info(host, port, ignore_cluster_errors=False, timeout=3):
     regex_index, match_object, res = client.expect([
         re.compile(b'\n\r\nEND\r\n'),
         re.compile(b'ERROR\r\n')
-    ], timeout)
+    ])
     client.close()
 
     if res == b'ERROR\r\n' and ignore_cluster_errors:

django_elasticache/memcached.py

@@ -54,8 +54,7 @@ def update_params(self, params):
             # set special 'behaviors' pylibmc attributes
             params['OPTIONS'] = {
                 'tcp_nodelay': True,
-                'ketama': True,
-                'IGNORE_CLUSTER_ERRORS': False,
+                'ketama': True
             }
 
     def clear_cluster_nodes_cache(self):

tests/test_backend.py

@@ -20,7 +20,6 @@ def test_patch_params():
     eq_(params['BINARY'], True)
     eq_(params['OPTIONS']['tcp_nodelay'], True)
     eq_(params['OPTIONS']['ketama'], True)
-    eq_(params['OPTIONS']['IGNORE_CLUSTER_ERRORS'], False)
 
 
 @raises(Exception)