Replace black with ruff format; run it

akx · akx · commit f06f672de8c9 · 2025-03-05T19:10:18.000+02:00
diff --git a/benchmarks/basic_operations.py b/benchmarks/basic_operations.py
@@ -54,7 +54,7 @@ def wrapper(*args, **kwargs):
             count = args[1]
         print(f"{func.__name__} - {count} Requests")
         print(f"Duration  = {duration}")
-        print(f"Rate = {count/duration}")
+        print(f"Rate = {count / duration}")
         print()
         return ret
 
diff --git a/benchmarks/command_packer_benchmark.py b/benchmarks/command_packer_benchmark.py
@@ -78,7 +78,6 @@ def pack_command(self, *args):
 
 
 class CommandPackerBenchmark(Benchmark):
-
     ARGUMENTS = (
         {
             "name": "connection_class",
diff --git a/benchmarks/socket_read_size.py b/benchmarks/socket_read_size.py
@@ -4,7 +4,6 @@
 
 
 class SocketReadBenchmark(Benchmark):
-
     ARGUMENTS = (
         {"name": "parser", "values": [PythonParser, _HiredisParser]},
         {
diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -1,5 +1,4 @@
 build
-black==24.3.0
 click==8.0.4
 invoke==2.2.0
 mock
diff --git a/redis/_parsers/base.py b/redis/_parsers/base.py
@@ -32,9 +32,9 @@
 from .encoders import Encoder
 from .socket import SERVER_CLOSED_CONNECTION_ERROR, SocketBuffer
 
-MODULE_LOAD_ERROR = "Error loading the extension. " "Please check the server logs."
+MODULE_LOAD_ERROR = "Error loading the extension. Please check the server logs."
 NO_SUCH_MODULE_ERROR = "Error unloading module: no such module with that name"
-MODULE_UNLOAD_NOT_POSSIBLE_ERROR = "Error unloading module: operation not " "possible."
+MODULE_UNLOAD_NOT_POSSIBLE_ERROR = "Error unloading module: operation not possible."
 MODULE_EXPORTS_DATA_TYPES_ERROR = (
     "Error unloading module: the module "
     "exports one or more module-side data "
diff --git a/redis/asyncio/cluster.py b/redis/asyncio/cluster.py
@@ -1154,9 +1154,7 @@ def get_node(
             return self.nodes_cache.get(node_name)
         else:
             raise DataError(
-                "get_node requires one of the following: "
-                "1. node name "
-                "2. host and port"
+                "get_node requires one of the following: 1. node name 2. host and port"
             )
 
     def set_nodes(
@@ -1338,7 +1336,7 @@ async def initialize(self) -> None:
                             if len(disagreements) > 5:
                                 raise RedisClusterException(
                                     f"startup_nodes could not agree on a valid "
-                                    f'slots cache: {", ".join(disagreements)}'
+                                    f"slots cache: {', '.join(disagreements)}"
                                 )
 
             # Validate if all slots are covered or if we should try next startup node
diff --git a/redis/auth/token.py b/redis/auth/token.py
@@ -76,7 +76,6 @@ def get_received_at_ms(self) -> float:
 
 
 class JWToken(TokenInterface):
-
     REQUIRED_FIELDS = {"exp"}
 
     def __init__(self, token: str):
diff --git a/redis/client.py b/redis/client.py
@@ -1514,8 +1514,7 @@ def raise_first_error(self, commands, response):
     def annotate_exception(self, exception, number, command):
         cmd = " ".join(map(safe_str, command))
         msg = (
-            f"Command # {number} ({cmd}) of pipeline "
-            f"caused error: {exception.args[0]}"
+            f"Command # {number} ({cmd}) of pipeline caused error: {exception.args[0]}"
         )
         exception.args = (msg,) + exception.args[1:]
 
diff --git a/redis/cluster.py b/redis/cluster.py
@@ -1628,7 +1628,7 @@ def initialize(self):
                             if len(disagreements) > 5:
                                 raise RedisClusterException(
                                     f"startup_nodes could not agree on a valid "
-                                    f'slots cache: {", ".join(disagreements)}'
+                                    f"slots cache: {', '.join(disagreements)}"
                                 )
 
             fully_covered = self.check_slots_coverage(tmp_slots)
@@ -2047,8 +2047,7 @@ def annotate_exception(self, exception, number, command):
         """
         cmd = " ".join(map(safe_str, command))
         msg = (
-            f"Command # {number} ({cmd}) of pipeline "
-            f"caused error: {exception.args[0]}"
+            f"Command # {number} ({cmd}) of pipeline caused error: {exception.args[0]}"
         )
         exception.args = (msg,) + exception.args[1:]
 
diff --git a/redis/commands/cluster.py b/redis/commands/cluster.py
@@ -595,7 +595,7 @@ def cluster_setslot(
                 "CLUSTER SETSLOT", slot_id, state, node_id, target_nodes=target_node
             )
         elif state.upper() == "STABLE":
-            raise RedisError('For "stable" state please use ' "cluster_setslot_stable")
+            raise RedisError('For "stable" state please use cluster_setslot_stable')
         else:
             raise RedisError(f"Invalid slot state: {state}")
 
diff --git a/redis/commands/core.py b/redis/commands/core.py
@@ -3415,7 +3415,9 @@ def smembers(self, name: str) -> Union[Awaitable[Set], Set]:
         """
         return self.execute_command("SMEMBERS", name, keys=[name])
 
-    def smismember(self, name: str, values: List, *args: List) -> Union[
+    def smismember(
+        self, name: str, values: List, *args: List
+    ) -> Union[
         Awaitable[List[Union[Literal[0], Literal[1]]]],
         List[Union[Literal[0], Literal[1]]],
     ]:
@@ -4162,8 +4164,7 @@ def zadd(
             raise DataError("ZADD allows either 'gt' or 'lt', not both")
         if incr and len(mapping) != 1:
             raise DataError(
-                "ZADD option 'incr' only works when passing a "
-                "single element/score pair"
+                "ZADD option 'incr' only works when passing a single element/score pair"
             )
         if nx and (gt or lt):
             raise DataError("Only one of 'nx', 'lt', or 'gr' may be defined.")
diff --git a/redis/commands/graph/commands.py b/redis/commands/graph/commands.py
@@ -171,9 +171,7 @@ def config(self, name, value=None, set=False):
             if set:
                 params.append(value)
             else:
-                raise DataError(
-                    "``value`` can be provided only when ``set`` is True"
-                )  # noqa
+                raise DataError("``value`` can be provided only when ``set`` is True")  # noqa
         return self.execute_command(CONFIG_CMD, *params)
 
     def list_keys(self):
diff --git a/redis/commands/helpers.py b/redis/commands/helpers.py
@@ -138,9 +138,9 @@ def stringify_param_value(value):
     elif value is None:
         return "null"
     elif isinstance(value, (list, tuple)):
-        return f'[{",".join(map(stringify_param_value, value))}]'
+        return f"[{','.join(map(stringify_param_value, value))}]"
     elif isinstance(value, dict):
-        return f'{{{",".join(f"{k}:{stringify_param_value(v)}" for k, v in value.items())}}}'  # noqa
+        return f"{{{','.join(f'{k}:{stringify_param_value(v)}' for k, v in value.items())}}}"  # noqa
     else:
         return str(value)
 
diff --git a/redis/connection.py b/redis/connection.py
@@ -622,9 +622,7 @@ def read_response(
         except OSError as e:
             if disconnect_on_error:
                 self.disconnect()
-            raise ConnectionError(
-                f"Error while reading from {host_error}" f" : {e.args}"
-            )
+            raise ConnectionError(f"Error while reading from {host_error} : {e.args}")
         except BaseException:
             # Also by default close in case of BaseException.  A lot of code
             # relies on this behaviour when doing Command/Response pairs.
diff --git a/redis/exceptions.py b/redis/exceptions.py
@@ -79,6 +79,7 @@ class ModuleError(ResponseError):
 
 class LockError(RedisError, ValueError):
     "Errors acquiring or releasing a lock"
+
     # NOTE: For backwards compatibility, this class derives from ValueError.
     # This was originally chosen to behave like threading.Lock.
 
@@ -89,11 +90,13 @@ def __init__(self, message=None, lock_name=None):
 
 class LockNotOwnedError(LockError):
     "Error trying to extend or release a lock that is (no longer) owned"
+
     pass
 
 
 class ChildDeadlockedError(Exception):
     "Error indicating that a child process is deadlocked after a fork()"
+
     pass
 
 
diff --git a/redis/ocsp.py b/redis/ocsp.py
@@ -57,7 +57,7 @@ def _check_certificate(issuer_cert, ocsp_bytes, validate=True):
     if ocsp_response.response_status == ocsp.OCSPResponseStatus.SUCCESSFUL:
         if ocsp_response.certificate_status != ocsp.OCSPCertStatus.GOOD:
             raise ConnectionError(
-                f'Received an {str(ocsp_response.certificate_status).split(".")[1]} '
+                f"Received an {str(ocsp_response.certificate_status).split('.')[1]} "
                 "ocsp certificate status"
             )
     else:
diff --git a/redis/sentinel.py b/redis/sentinel.py
@@ -273,7 +273,7 @@ def __repr__(self):
             )
         return (
             f"<{type(self).__module__}.{type(self).__name__}"
-            f'(sentinels=[{",".join(sentinel_addresses)}])>'
+            f"(sentinels=[{','.join(sentinel_addresses)}])>"
         )
 
     def check_master_state(self, state, service_name):
diff --git a/tasks.py b/tasks.py
@@ -28,7 +28,7 @@ def build_docs(c):
 def linters(c):
     """Run code linters"""
     run("ruff check tests redis")
-    run("black --target-version py37 --check --diff tests redis")
+    run("ruff format --check --diff tests redis")
     run("vulture redis whitelist.py --min-confidence 80")
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -646,7 +646,7 @@ def wait_for_command(client, monitor, command, key=None):
         if Version(redis_version) >= Version("5.0.0"):
             id_str = str(client.client_id())
         else:
-            id_str = f"{random.randrange(2 ** 32):08x}"
+            id_str = f"{random.randrange(2**32):08x}"
         key = f"__REDIS-PY-{id_str}__"
     client.get(key)
     while True:
diff --git a/tests/test_asyncio/conftest.py b/tests/test_asyncio/conftest.py
@@ -242,7 +242,7 @@ async def wait_for_command(
         if Version(redis_version) >= Version("5.0.0"):
             id_str = str(await client.client_id())
         else:
-            id_str = f"{random.randrange(2 ** 32):08x}"
+            id_str = f"{random.randrange(2**32):08x}"
         key = f"__REDIS-PY-{id_str}__"
     await client.get(key)
     while True:
diff --git a/tests/test_asyncio/test_cluster.py b/tests/test_asyncio/test_cluster.py
@@ -146,7 +146,6 @@ async def get_mocked_redis_client(
     with mock.patch.object(ClusterNode, "execute_command") as execute_command_mock:
 
         async def execute_command(*_args, **_kwargs):
-
             if _args[0] == "CLUSTER SLOTS":
                 if cluster_slots_raise_error:
                     raise ResponseError()
@@ -1577,23 +1576,23 @@ async def test_cluster_bitop_not_empty_string(self, r: RedisCluster) -> None:
 
     @skip_if_server_version_lt("2.6.0")
     async def test_cluster_bitop_not(self, r: RedisCluster) -> None:
-        test_str = b"\xAA\x00\xFF\x55"
+        test_str = b"\xaa\x00\xff\x55"
         correct = ~0xAA00FF55 & 0xFFFFFFFF
         await r.set("{foo}a", test_str)
         await r.bitop("not", "{foo}r", "{foo}a")
         assert int(binascii.hexlify(await r.get("{foo}r")), 16) == correct
 
     @skip_if_server_version_lt("2.6.0")
     async def test_cluster_bitop_not_in_place(self, r: RedisCluster) -> None:
-        test_str = b"\xAA\x00\xFF\x55"
+        test_str = b"\xaa\x00\xff\x55"
         correct = ~0xAA00FF55 & 0xFFFFFFFF
         await r.set("{foo}a", test_str)
         await r.bitop("not", "{foo}a", "{foo}a")
         assert int(binascii.hexlify(await r.get("{foo}a")), 16) == correct
 
     @skip_if_server_version_lt("2.6.0")
     async def test_cluster_bitop_single_string(self, r: RedisCluster) -> None:
-        test_str = b"\x01\x02\xFF"
+        test_str = b"\x01\x02\xff"
         await r.set("{foo}a", test_str)
         await r.bitop("and", "{foo}res1", "{foo}a")
         await r.bitop("or", "{foo}res2", "{foo}a")
@@ -1604,8 +1603,8 @@ async def test_cluster_bitop_single_string(self, r: RedisCluster) -> None:
 
     @skip_if_server_version_lt("2.6.0")
     async def test_cluster_bitop_string_operands(self, r: RedisCluster) -> None:
-        await r.set("{foo}a", b"\x01\x02\xFF\xFF")
-        await r.set("{foo}b", b"\x01\x02\xFF")
+        await r.set("{foo}a", b"\x01\x02\xff\xff")
+        await r.set("{foo}b", b"\x01\x02\xff")
         await r.bitop("and", "{foo}res1", "{foo}a", "{foo}b")
         await r.bitop("or", "{foo}res2", "{foo}a", "{foo}b")
         await r.bitop("xor", "{foo}res3", "{foo}a", "{foo}b")
diff --git a/tests/test_asyncio/test_commands.py b/tests/test_asyncio/test_commands.py
@@ -711,8 +711,9 @@ async def test_config_set_for_search_module(self, r: redis.Redis):
                 "search-default-dialect"
             ] == default_dialect_new
             assert (
-                (await r.ft().config_get("*"))[b"DEFAULT_DIALECT"]
-            ).decode() == default_dialect_new
+                ((await r.ft().config_get("*"))[b"DEFAULT_DIALECT"]).decode()
+                == default_dialect_new
+            )
         except AssertionError as ex:
             raise ex
         finally:
@@ -844,7 +845,7 @@ async def test_bitop_not_empty_string(self, r: redis.Redis):
     @skip_if_server_version_lt("2.6.0")
     @pytest.mark.onlynoncluster
     async def test_bitop_not(self, r: redis.Redis):
-        test_str = b"\xAA\x00\xFF\x55"
+        test_str = b"\xaa\x00\xff\x55"
         correct = ~0xAA00FF55 & 0xFFFFFFFF
         await r.set("a", test_str)
         await r.bitop("not", "r", "a")
@@ -853,7 +854,7 @@ async def test_bitop_not(self, r: redis.Redis):
     @skip_if_server_version_lt("2.6.0")
     @pytest.mark.onlynoncluster
     async def test_bitop_not_in_place(self, r: redis.Redis):
-        test_str = b"\xAA\x00\xFF\x55"
+        test_str = b"\xaa\x00\xff\x55"
         correct = ~0xAA00FF55 & 0xFFFFFFFF
         await r.set("a", test_str)
         await r.bitop("not", "a", "a")
@@ -862,7 +863,7 @@ async def test_bitop_not_in_place(self, r: redis.Redis):
     @skip_if_server_version_lt("2.6.0")
     @pytest.mark.onlynoncluster
     async def test_bitop_single_string(self, r: redis.Redis):
-        test_str = b"\x01\x02\xFF"
+        test_str = b"\x01\x02\xff"
         await r.set("a", test_str)
         await r.bitop("and", "res1", "a")
         await r.bitop("or", "res2", "a")
@@ -874,8 +875,8 @@ async def test_bitop_single_string(self, r: redis.Redis):
     @skip_if_server_version_lt("2.6.0")
     @pytest.mark.onlynoncluster
     async def test_bitop_string_operands(self, r: redis.Redis):
-        await r.set("a", b"\x01\x02\xFF\xFF")
-        await r.set("b", b"\x01\x02\xFF")
+        await r.set("a", b"\x01\x02\xff\xff")
+        await r.set("b", b"\x01\x02\xff")
         await r.bitop("and", "res1", "a", "b")
         await r.bitop("or", "res2", "a", "b")
         await r.bitop("xor", "res3", "a", "b")
diff --git a/tests/test_asyncio/test_graph.py b/tests/test_asyncio/test_graph.py
@@ -44,8 +44,7 @@ async def test_graph_creation(decoded_r: redis.Redis):
     await graph.commit()
 
     query = (
-        'MATCH (p:person)-[v:visited {purpose:"pleasure"}]->(c:country) '
-        "RETURN p, v, c"
+        'MATCH (p:person)-[v:visited {purpose:"pleasure"}]->(c:country) RETURN p, v, c'
     )
 
     result = await graph.query(query)
diff --git a/tests/test_asyncio/test_search.py b/tests/test_asyncio/test_search.py
@@ -1797,10 +1797,10 @@ async def test_binary_and_text_fields(decoded_r: redis.Redis):
         docs[0]["vector_emb"], dtype=np.float32
     )
 
-    assert np.array_equal(
-        decoded_vec_from_search_results, fake_vec
-    ), "The vectors are not equal"
+    assert np.array_equal(decoded_vec_from_search_results, fake_vec), (
+        "The vectors are not equal"
+    )
 
-    assert (
-        docs[0]["first_name"] == mixed_data["first_name"]
-    ), "The text field is not decoded correctly"
+    assert docs[0]["first_name"] == mixed_data["first_name"], (
+        "The text field is not decoded correctly"
+    )
diff --git a/tests/test_auth/test_token.py b/tests/test_auth/test_token.py
@@ -6,7 +6,6 @@
 
 
 class TestToken:
-
     def test_simple_token(self):
         token = SimpleToken(
             "value",
diff --git a/tests/test_cluster.py b/tests/test_cluster.py
@@ -1692,23 +1692,23 @@ def test_cluster_bitop_not_empty_string(self, r):
 
     @skip_if_server_version_lt("2.6.0")
     def test_cluster_bitop_not(self, r):
-        test_str = b"\xAA\x00\xFF\x55"
+        test_str = b"\xaa\x00\xff\x55"
         correct = ~0xAA00FF55 & 0xFFFFFFFF
         r["{foo}a"] = test_str
         r.bitop("not", "{foo}r", "{foo}a")
         assert int(binascii.hexlify(r["{foo}r"]), 16) == correct
 
     @skip_if_server_version_lt("2.6.0")
     def test_cluster_bitop_not_in_place(self, r):
-        test_str = b"\xAA\x00\xFF\x55"
+        test_str = b"\xaa\x00\xff\x55"
         correct = ~0xAA00FF55 & 0xFFFFFFFF
         r["{foo}a"] = test_str
         r.bitop("not", "{foo}a", "{foo}a")
         assert int(binascii.hexlify(r["{foo}a"]), 16) == correct
 
     @skip_if_server_version_lt("2.6.0")
     def test_cluster_bitop_single_string(self, r):
-        test_str = b"\x01\x02\xFF"
+        test_str = b"\x01\x02\xff"
         r["{foo}a"] = test_str
         r.bitop("and", "{foo}res1", "{foo}a")
         r.bitop("or", "{foo}res2", "{foo}a")
@@ -1719,8 +1719,8 @@ def test_cluster_bitop_single_string(self, r):
 
     @skip_if_server_version_lt("2.6.0")
     def test_cluster_bitop_string_operands(self, r):
-        r["{foo}a"] = b"\x01\x02\xFF\xFF"
-        r["{foo}b"] = b"\x01\x02\xFF"
+        r["{foo}a"] = b"\x01\x02\xff\xff"
+        r["{foo}b"] = b"\x01\x02\xff"
         r.bitop("and", "{foo}res1", "{foo}a", "{foo}b")
         r.bitop("or", "{foo}res2", "{foo}a", "{foo}b")
         r.bitop("xor", "{foo}res3", "{foo}a", "{foo}b")
diff --git a/tests/test_commands.py b/tests/test_commands.py
diff --git a/tests/test_connection.py b/tests/test_connection.py
diff --git a/tests/test_graph.py b/tests/test_graph.py
diff --git a/tests/test_search.py b/tests/test_search.py

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ def pack_command(self, *args):`
`78`	`78`
`79`	`79`
`80`	`80`	`class CommandPackerBenchmark(Benchmark):`
`81`		`-`
`82`	`81`	`ARGUMENTS = (`
`83`	`82`	`{`
`84`	`83`	`"name": "connection_class",`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`
`6`	`6`	`class SocketReadBenchmark(Benchmark):`
`7`		`-`
`8`	`7`	`ARGUMENTS = (`
`9`	`8`	`{"name": "parser", "values": [PythonParser, _HiredisParser]},`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`build`
`2`		`-black==24.3.0`
`3`	`2`	`click==8.0.4`
`4`	`3`	`invoke==2.2.0`
`5`	`4`	`mock`
Original file line number	Diff line number	Diff line change
`@@ -1514,8 +1514,7 @@ def raise_first_error(self, commands, response):`
`1514`	`1514`	`def annotate_exception(self, exception, number, command):`
`1515`	`1515`	`cmd = " ".join(map(safe_str, command))`
`1516`	`1516`	`msg = (`
`1517`		`- f"Command # {number} ({cmd}) of pipeline "`
`1518`		`- f"caused error: {exception.args[0]}"`
	`1517`	`+ f"Command # {number} ({cmd}) of pipeline caused error: {exception.args[0]}"`
`1519`	`1518`	`)`
`1520`	`1519`	`exception.args = (msg,) + exception.args[1:]`
`1521`	`1520`
Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ def cluster_setslot(`
`595`	`595`	`"CLUSTER SETSLOT", slot_id, state, node_id, target_nodes=target_node`
`596`	`596`	`)`
`597`	`597`	`elif state.upper() == "STABLE":`
`598`		`- raise RedisError('For "stable" state please use ' "cluster_setslot_stable")`
	`598`	`+ raise RedisError('For "stable" state please use cluster_setslot_stable')`
`599`	`599`	`else:`
`600`	`600`	`raise RedisError(f"Invalid slot state: {state}")`
`601`	`601`