Fixed linters

Author: barshaul

redis/commands/__init__.py

@@ -12,4 +12,4 @@
     'list_or_args',
     'RedisModuleCommands',
     'SentinelCommands'
-]
+]

redis/commands/core.py

@@ -374,7 +374,7 @@ def client_info(self, **kwargs):
         For more information check https://redis.io/commands/client-info
         """
         return self.execute_command('CLIENT INFO', **kwargs)
-      
+
     def client_list(self, _type=None, client_id=[], **kwargs):
         """
         Returns a list of currently connected clients.

tests/test_cluster.py

@@ -31,7 +31,6 @@
 from redis.utils import str_if_bytes
 from tests.test_pubsub import wait_for_message
 
-from redis.crc import key_slot
 from .conftest import (
     _get_client,
     skip_if_redis_enterprise,

tests/test_connection_pool.py

@@ -9,7 +9,8 @@
 import redis
 from redis.connection import ssl_available, to_bool
 
-from .conftest import _get_client, skip_if_redis_enterprise, skip_if_server_version_lt
+from .conftest import _get_client, skip_if_redis_enterprise, \
+    skip_if_server_version_lt
 from .test_pubsub import wait_for_message
 
 
@@ -45,7 +46,8 @@ def get_pool(
     def test_connection_creation(self):
         connection_kwargs = {"foo": "bar", "biz": "baz"}
         pool = self.get_pool(
-            connection_kwargs=connection_kwargs, connection_class=DummyConnection
+            connection_kwargs=connection_kwargs,
+            connection_class=DummyConnection
         )
         connection = pool.get_connection("_")
         assert isinstance(connection, DummyConnection)
@@ -60,7 +62,8 @@ def test_multiple_connections(self, master_host):
 
     def test_max_connections(self, master_host):
         connection_kwargs = {"host": master_host[0], "port": master_host[1]}
-        pool = self.get_pool(max_connections=2, connection_kwargs=connection_kwargs)
+        pool = self.get_pool(max_connections=2,
+                             connection_kwargs=connection_kwargs)
         pool.get_connection("_")
         pool.get_connection("_")
         with pytest.raises(redis.ConnectionError):
@@ -82,7 +85,8 @@ def test_repr_contains_db_info_tcp(self):
             "client_name": "test-client",
         }
         pool = self.get_pool(
-            connection_kwargs=connection_kwargs, connection_class=redis.Connection
+            connection_kwargs=connection_kwargs,
+            connection_class=redis.Connection
         )
         expected = (
             "ConnectionPool<Connection<"
@@ -91,7 +95,8 @@ def test_repr_contains_db_info_tcp(self):
         assert repr(pool) == expected
 
     def test_repr_contains_db_info_unix(self):
-        connection_kwargs = {"path": "/abc", "db": 1, "client_name": "test-client"}
+        connection_kwargs = {"path": "/abc", "db": 1,
+                             "client_name": "test-client"}
         pool = self.get_pool(
             connection_kwargs=connection_kwargs,
             connection_class=redis.UnixDomainSocketConnection,
@@ -330,7 +335,8 @@ def test_boolean_parsing(self):
             assert expected is to_bool(value)
 
     def test_client_name_in_querystring(self):
-        pool = redis.ConnectionPool.from_url("redis://location?client_name=test-client")
+        pool = redis.ConnectionPool.from_url(
+            "redis://location?client_name=test-client")
         assert pool.connection_kwargs["client_name"] == "test-client"
 
     def test_invalid_extra_typed_querystring_options(self):
@@ -342,7 +348,8 @@ def test_invalid_extra_typed_querystring_options(self):
     def test_extra_querystring_options(self):
         pool = redis.ConnectionPool.from_url("redis://localhost?a=1&b=2")
         assert pool.connection_class == redis.Connection
-        assert pool.connection_kwargs == {"host": "localhost", "a": "1", "b": "2"}
+        assert pool.connection_kwargs == {"host": "localhost", "a": "1",
+                                          "b": "2"}
 
     def test_calling_from_subclass_returns_correct_instance(self):
         pool = redis.BlockingConnectionPool.from_url("redis://localhost")
@@ -437,13 +444,15 @@ def test_db_in_querystring(self):
         }
 
     def test_client_name_in_querystring(self):
-        pool = redis.ConnectionPool.from_url("redis://location?client_name=test-client")
+        pool = redis.ConnectionPool.from_url(
+            "redis://location?client_name=test-client")
         assert pool.connection_kwargs["client_name"] == "test-client"
 
     def test_extra_querystring_options(self):
         pool = redis.ConnectionPool.from_url("unix:///socket?a=1&b=2")
         assert pool.connection_class == redis.UnixDomainSocketConnection
-        assert pool.connection_kwargs == {"path": "/socket", "a": "1", "b": "2"}
+        assert pool.connection_kwargs == {"path": "/socket", "a": "1",
+                                          "b": "2"}
 
 
 @pytest.mark.skipif(not ssl_available, reason="SSL not installed")
@@ -471,10 +480,12 @@ def get_connection(self, *args, **kwargs):
         pool = DummyConnectionPool.from_url("rediss://?ssl_cert_reqs=required")
         assert pool.get_connection("_").cert_reqs == ssl.CERT_REQUIRED
 
-        pool = DummyConnectionPool.from_url("rediss://?ssl_check_hostname=False")
+        pool = DummyConnectionPool.from_url(
+            "rediss://?ssl_check_hostname=False")
         assert pool.get_connection("_").check_hostname is False
 
-        pool = DummyConnectionPool.from_url("rediss://?ssl_check_hostname=True")
+        pool = DummyConnectionPool.from_url(
+            "rediss://?ssl_check_hostname=True")
         assert pool.get_connection("_").check_hostname is True
 
 
@@ -497,7 +508,6 @@ def test_on_connect_error(self):
     @pytest.mark.onlynoncluster
     @skip_if_server_version_lt('2.8.8')
     @skip_if_redis_enterprise()
-
     def test_busy_loading_disconnects_socket(self, r):
         """
         If Redis raises a LOADING error, the connection should be
@@ -510,15 +520,15 @@ def test_busy_loading_disconnects_socket(self, r):
     @pytest.mark.onlynoncluster
     @skip_if_server_version_lt('2.8.8')
     @skip_if_redis_enterprise()
-
     def test_busy_loading_from_pipeline_immediate_command(self, r):
         """
         BusyLoadingErrors should raise from Pipelines that execute a
         command immediately, like WATCH does.
         """
         pipe = r.pipeline()
         with pytest.raises(redis.BusyLoadingError):
-            pipe.immediate_execute_command("DEBUG", "ERROR", "LOADING fake message")
+            pipe.immediate_execute_command("DEBUG", "ERROR",
+                                           "LOADING fake message")
         pool = r.connection_pool
         assert not pipe.connection
         assert len(pool._available_connections) == 1
@@ -527,7 +537,6 @@ def test_busy_loading_from_pipeline_immediate_command(self, r):
     @pytest.mark.onlynoncluster
     @skip_if_server_version_lt('2.8.8')
     @skip_if_redis_enterprise()
-
     def test_busy_loading_from_pipeline(self, r):
         """
         BusyLoadingErrors should be raised from a pipeline execution
@@ -544,7 +553,6 @@ def test_busy_loading_from_pipeline(self, r):
 
     @skip_if_server_version_lt('2.8.8')
     @skip_if_redis_enterprise()
-
     def test_read_only_error(self, r):
         "READONLY errors get turned in ReadOnlyError exceptions"
         with pytest.raises(redis.ReadOnlyError):
@@ -578,7 +586,8 @@ def test_connect_no_auth_supplied_when_required(self, r):
         """
         with pytest.raises(redis.AuthenticationError):
             r.execute_command(
-                "DEBUG", "ERROR", "ERR Client sent AUTH, but no password is set"
+                "DEBUG", "ERROR",
+                "ERR Client sent AUTH, but no password is set"
             )
 
     @skip_if_redis_enterprise()
@@ -592,7 +601,8 @@ def test_connect_invalid_password_supplied(self, r):
 class TestMultiConnectionClient:
     @pytest.fixture()
     def r(self, request):
-        return _get_client(redis.Redis, request, single_connection_client=False)
+        return _get_client(redis.Redis, request,
+                           single_connection_client=False)
 
     def test_multi_connection_command(self, r):
         assert not r.connection
@@ -606,7 +616,8 @@ class TestHealthCheck:
 
     @pytest.fixture()
     def r(self, request):
-        return _get_client(redis.Redis, request, health_check_interval=self.interval)
+        return _get_client(redis.Redis, request,
+                           health_check_interval=self.interval)
 
     def assert_interval_advanced(self, connection):
         diff = connection.next_health_check - time.time()
@@ -622,7 +633,7 @@ def test_arbitrary_command_invokes_health_check(self, r):
         r.get("foo")
         r.connection.next_health_check = time.time()
         with mock.patch.object(
-            r.connection, "send_command", wraps=r.connection.send_command
+                r.connection, "send_command", wraps=r.connection.send_command
         ) as m:
             r.get("foo")
             m.assert_called_with("PING", check_health=False)
@@ -638,7 +649,7 @@ def test_arbitrary_command_advances_next_health_check(self, r):
     def test_health_check_not_invoked_within_interval(self, r):
         r.get("foo")
         with mock.patch.object(
-            r.connection, "send_command", wraps=r.connection.send_command
+                r.connection, "send_command", wraps=r.connection.send_command
         ) as m:
             r.get("foo")
             ping_call_spec = (("PING",), {"check_health": False})
@@ -649,7 +660,8 @@ def test_health_check_in_pipeline(self, r):
             pipe.connection = pipe.connection_pool.get_connection("_")
             pipe.connection.next_health_check = 0
             with mock.patch.object(
-                pipe.connection, "send_command", wraps=pipe.connection.send_command
+                    pipe.connection, "send_command",
+                    wraps=pipe.connection.send_command
             ) as m:
                 responses = pipe.set("foo", "bar").get("foo").execute()
                 m.assert_any_call("PING", check_health=False)
@@ -660,7 +672,8 @@ def test_health_check_in_transaction(self, r):
             pipe.connection = pipe.connection_pool.get_connection("_")
             pipe.connection.next_health_check = 0
             with mock.patch.object(
-                pipe.connection, "send_command", wraps=pipe.connection.send_command
+                    pipe.connection, "send_command",
+                    wraps=pipe.connection.send_command
             ) as m:
                 responses = pipe.set("foo", "bar").get("foo").execute()
                 m.assert_any_call("PING", check_health=False)
@@ -672,7 +685,8 @@ def test_health_check_in_watched_pipeline(self, r):
             pipe.connection = pipe.connection_pool.get_connection("_")
             pipe.connection.next_health_check = 0
             with mock.patch.object(
-                pipe.connection, "send_command", wraps=pipe.connection.send_command
+                    pipe.connection, "send_command",
+                    wraps=pipe.connection.send_command
             ) as m:
                 pipe.watch("foo")
                 # the health check should be called when watching
@@ -696,7 +710,7 @@ def test_health_check_in_pubsub_before_subscribe(self, r):
         p.connection = p.connection_pool.get_connection("_")
         p.connection.next_health_check = 0
         with mock.patch.object(
-            p.connection, "send_command", wraps=p.connection.send_command
+                p.connection, "send_command", wraps=p.connection.send_command
         ) as m:
             assert not p.subscribed
             p.subscribe("foo")
@@ -718,7 +732,7 @@ def test_health_check_in_pubsub_after_subscribed(self, r):
         p.connection = p.connection_pool.get_connection("_")
         p.connection.next_health_check = 0
         with mock.patch.object(
-            p.connection, "send_command", wraps=p.connection.send_command
+                p.connection, "send_command", wraps=p.connection.send_command
         ) as m:
             p.subscribe("foo")
             subscribe_message = wait_for_message(p)
@@ -746,7 +760,8 @@ def test_health_check_in_pubsub_after_subscribed(self, r):
             assert wait_for_message(p) is None
             # now that the connection is subscribed, the pubsub health
             # check should have taken over and include the HEALTH_CHECK_MESSAGE
-            m.assert_any_call("PING", p.HEALTH_CHECK_MESSAGE, check_health=False)
+            m.assert_any_call("PING", p.HEALTH_CHECK_MESSAGE,
+                              check_health=False)
             self.assert_interval_advanced(p.connection)
 
     def test_health_check_in_pubsub_poll(self, r):
@@ -757,7 +772,7 @@ def test_health_check_in_pubsub_poll(self, r):
         p = r.pubsub()
         p.connection = p.connection_pool.get_connection("_")
         with mock.patch.object(
-            p.connection, "send_command", wraps=p.connection.send_command
+                p.connection, "send_command", wraps=p.connection.send_command
         ) as m:
             p.subscribe("foo")
             subscribe_message = wait_for_message(p)
@@ -777,5 +792,6 @@ def test_health_check_in_pubsub_poll(self, r):
             # should be advanced
             p.connection.next_health_check = 0
             assert wait_for_message(p) is None
-            m.assert_called_with("PING", p.HEALTH_CHECK_MESSAGE, check_health=False)
+            m.assert_called_with("PING", p.HEALTH_CHECK_MESSAGE,
+                                 check_health=False)
             self.assert_interval_advanced(p.connection)