Apply ruff format fixes

Author: ulgens

django_redis/cache.py

@@ -13,7 +13,8 @@
 
 
 def omit_exception(
-    method: Optional[Callable] = None, return_value: Optional[Any] = None
+    method: Optional[Callable] = None,
+    return_value: Optional[Any] = None,
 ):
     """
     Simple decorator that intercepts connection
@@ -44,12 +45,15 @@ def __init__(self, server: str, params: dict[str, Any]) -> None:
         self._server = server
         self._params = params
         self._default_scan_itersize = getattr(
-            settings, "DJANGO_REDIS_SCAN_ITERSIZE", 10
+            settings,
+            "DJANGO_REDIS_SCAN_ITERSIZE",
+            10,
         )
 
         options = params.get("OPTIONS", {})
         self._client_cls = options.get(
-            "CLIENT_CLASS", "django_redis.client.DefaultClient"
+            "CLIENT_CLASS",
+            "django_redis.client.DefaultClient",
         )
         self._client_cls = import_string(self._client_cls)
         self._client = None
@@ -59,7 +63,9 @@ def __init__(self, server: str, params: dict[str, Any]) -> None:
             getattr(settings, "DJANGO_REDIS_IGNORE_EXCEPTIONS", False),
         )
         self._log_ignored_exceptions = getattr(
-            settings, "DJANGO_REDIS_LOG_IGNORED_EXCEPTIONS", False
+            settings,
+            "DJANGO_REDIS_LOG_IGNORED_EXCEPTIONS",
+            False,
         )
         self.logger = (
             logging.getLogger(getattr(settings, "DJANGO_REDIS_LOGGER", __name__))

django_redis/client/default.py

@@ -48,7 +48,7 @@ def __init__(self, server, params: dict[str, Any], backend: BaseCache) -> None:
 
         self.reverse_key = get_key_func(
             params.get("REVERSE_KEY_FUNCTION")
-            or "django_redis.util.default_reverse_key"
+            or "django_redis.util.default_reverse_key",
         )
 
         if not self._server:
@@ -63,12 +63,14 @@ def __init__(self, server, params: dict[str, Any], backend: BaseCache) -> None:
         self._replica_read_only = self._options.get("REPLICA_READ_ONLY", True)
 
         serializer_path = self._options.get(
-            "SERIALIZER", "django_redis.serializers.pickle.PickleSerializer"
+            "SERIALIZER",
+            "django_redis.serializers.pickle.PickleSerializer",
         )
         serializer_cls = import_string(serializer_path)
 
         compressor_path = self._options.get(
-            "COMPRESSOR", "django_redis.compressors.identity.IdentityCompressor"
+            "COMPRESSOR",
+            "django_redis.compressors.identity.IdentityCompressor",
         )
         compressor_cls = import_string(compressor_path)
 
@@ -83,13 +85,16 @@ def __contains__(self, key: KeyT) -> bool:
     def _has_compression_enabled(self) -> bool:
         return (
             self._options.get(
-                "COMPRESSOR", "django_redis.compressors.identity.IdentityCompressor"
+                "COMPRESSOR",
+                "django_redis.compressors.identity.IdentityCompressor",
             )
             != "django_redis.compressors.identity.IdentityCompressor"
         )
 
     def get_next_client_index(
-        self, write: bool = True, tried: Optional[list[int]] = None
+        self,
+        write: bool = True,
+        tried: Optional[list[int]] = None,
     ) -> int:
         """
         Return a next index for read client. This function implements a default
@@ -305,7 +310,10 @@ def get(
         return self.decode(value)
 
     def persist(
-        self, key: KeyT, version: Optional[int] = None, client: Optional[Redis] = None
+        self,
+        key: KeyT,
+        version: Optional[int] = None,
+        client: Optional[Redis] = None,
     ) -> bool:
         if client is None:
             client = self.get_client(write=True)
@@ -517,7 +525,9 @@ def encode(self, value: EncodableT) -> Union[bytes, int]:
         return value
 
     def _decode_iterable_result(
-        self, result: Any, covert_to_set: bool = True
+        self,
+        result: Any,
+        covert_to_set: bool = True,
     ) -> Union[list[Any], None, Any]:
         if result is None:
             return None
@@ -672,7 +682,10 @@ def decr(
         return self._incr(key=key, delta=-delta, version=version, client=client)
 
     def ttl(
-        self, key: KeyT, version: Optional[int] = None, client: Optional[Redis] = None
+        self,
+        key: KeyT,
+        version: Optional[int] = None,
+        client: Optional[Redis] = None,
     ) -> Optional[int]:
         """
         Executes TTL redis command and return the "time-to-live" of specified key.
@@ -698,7 +711,10 @@ def ttl(
         return None
 
     def pttl(
-        self, key: KeyT, version: Optional[int] = None, client: Optional[Redis] = None
+        self,
+        key: KeyT,
+        version: Optional[int] = None,
+        client: Optional[Redis] = None,
     ) -> Optional[int]:
         """
         Executes PTTL redis command and return the "time-to-live" of specified key.
@@ -724,7 +740,10 @@ def pttl(
         return None
 
     def has_key(
-        self, key: KeyT, version: Optional[int] = None, client: Optional[Redis] = None
+        self,
+        key: KeyT,
+        version: Optional[int] = None,
+        client: Optional[Redis] = None,
     ) -> bool:
         """
         Test if key exists.
@@ -759,7 +778,10 @@ def iter_keys(
             yield self.reverse_key(item.decode())
 
     def keys(
-        self, search: str, version: Optional[int] = None, client: Optional[Redis] = None
+        self,
+        search: str,
+        version: Optional[int] = None,
+        client: Optional[Redis] = None,
     ) -> list[Any]:
         """
         Execute KEYS command and return matched results.
@@ -778,7 +800,10 @@ def keys(
             raise ConnectionInterrupted(connection=client) from e
 
     def make_key(
-        self, key: KeyT, version: Optional[int] = None, prefix: Optional[str] = None
+        self,
+        key: KeyT,
+        version: Optional[int] = None,
+        prefix: Optional[str] = None,
     ) -> KeyT:
         if isinstance(key, CacheKey):
             return key
@@ -792,7 +817,10 @@ def make_key(
         return CacheKey(self._backend.key_func(key, prefix, version))
 
     def make_pattern(
-        self, pattern: str, version: Optional[int] = None, prefix: Optional[str] = None
+        self,
+        pattern: str,
+        version: Optional[int] = None,
+        prefix: Optional[str] = None,
     ) -> str:
         if isinstance(pattern, CacheKey):
             return pattern

django_redis/client/herd.py

@@ -90,7 +90,12 @@ def set(
         real_timeout = timeout + self._herd_timeout
 
         return super().set(
-            key, packed, timeout=real_timeout, version=version, client=client, nx=nx
+            key,
+            packed,
+            timeout=real_timeout,
+            version=version,
+            client=client,
+            nx=nx,
         )
 
     def get(self, key, default=None, version=None, client=None):
@@ -129,7 +134,12 @@ def get_many(self, keys, version=None, client=None):
         return recovered_data
 
     def set_many(
-        self, data, timeout=DEFAULT_TIMEOUT, version=None, client=None, herd=True
+        self,
+        data,
+        timeout=DEFAULT_TIMEOUT,
+        version=None,
+        client=None,
+        herd=True,
     ):
         """
         Set a bunch of values in the cache at once from a dict of key/value

django_redis/client/sharded.py

@@ -53,7 +53,11 @@ def add(self, key, value, timeout=DEFAULT_TIMEOUT, version=None, client=None):
             client = self.get_server(key)
 
         return super().add(
-            key=key, value=value, version=version, client=client, timeout=timeout
+            key=key,
+            value=value,
+            version=version,
+            client=client,
+            timeout=timeout,
         )
 
     def get(self, key, default=None, version=None, client=None):
@@ -306,7 +310,12 @@ def keys(self, search, version=None):
         return [self.reverse_key(k.decode()) for k in keys]
 
     def delete_pattern(
-        self, pattern, version=None, client=None, itersize=None, prefix=None
+        self,
+        pattern,
+        version=None,
+        client=None,
+        itersize=None,
+        prefix=None,
     ):
         """
         Remove all keys matching pattern.
@@ -420,7 +429,11 @@ def sscan(
             key = self.make_key(key, version=version)
             client = self.get_server(key)
         return super().sscan(
-            key=key, match=match, count=count, version=version, client=client
+            key=key,
+            match=match,
+            count=count,
+            version=version,
+            client=client,
         )
 
     def sscan_iter(
@@ -435,7 +448,11 @@ def sscan_iter(
             key = self.make_key(key, version=version)
             client = self.get_server(key)
         return super().sscan_iter(
-            key=key, match=match, count=count, version=version, client=client
+            key=key,
+            match=match,
+            count=count,
+            version=version,
+            client=client,
         )
 
     def srandmember(

django_redis/pool.py

@@ -19,7 +19,8 @@ class ConnectionFactory:
 
     def __init__(self, options):
         pool_cls_path = options.get(
-            "CONNECTION_POOL_CLASS", "redis.connection.ConnectionPool"
+            "CONNECTION_POOL_CLASS",
+            "redis.connection.ConnectionPool",
         )
         self.pool_cls = import_string(pool_cls_path)
         self.pool_cls_kwargs = options.get("CONNECTION_POOL_KWARGS", {})
@@ -87,7 +88,8 @@ def get_connection(self, params):
         """
         pool = self.get_or_create_connection_pool(params)
         return self.redis_client_cls(
-            connection_pool=pool, **self.redis_client_cls_kwargs
+            connection_pool=pool,
+            **self.redis_client_cls_kwargs,
         )
 
     def get_parser_cls(self):
@@ -132,7 +134,8 @@ class SentinelConnectionFactory(ConnectionFactory):
     def __init__(self, options):
         # allow overriding the default SentinelConnectionPool class
         options.setdefault(
-            "CONNECTION_POOL_CLASS", "redis.sentinel.SentinelConnectionPool"
+            "CONNECTION_POOL_CLASS",
+            "redis.sentinel.SentinelConnectionPool",
         )
         super().__init__(options)
 
@@ -175,11 +178,13 @@ def get_connection_pool(self, params):
         new_query = urlencode(query_params, doseq=True)
 
         new_url = urlunparse(
-            (url.scheme, url.netloc, url.path, url.params, new_query, url.fragment)
+            (url.scheme, url.netloc, url.path, url.params, new_query, url.fragment),
         )
 
         cp_params.update(
-            service_name=url.hostname, sentinel_manager=self._sentinel, url=new_url
+            service_name=url.hostname,
+            sentinel_manager=self._sentinel,
+            url=new_url,
         )
 
         return super().get_connection_pool(cp_params)

tests/test_backend.py

@@ -523,7 +523,8 @@ def test_delete_pattern_with_settings_default_scan_count(
         cache.delete_pattern("*foo-a*")
 
         client_mock.delete_pattern.assert_called_once_with(
-            "*foo-a*", itersize=expected_count
+            "*foo-a*",
+            itersize=expected_count,
         )
 
     def test_close(self, cache: RedisCache, settings: SettingsWrapper):
@@ -905,7 +906,8 @@ def test_sdiffstore_with_keys_version(self, cache: RedisCache):
         assert cache.smembers("foo3") == {"bar1"}
 
     def test_sdiffstore_with_different_keys_versions_without_initial_set_in_version(
-        self, cache: RedisCache
+        self,
+        cache: RedisCache,
     ):
         if isinstance(cache.client, ShardClient):
             pytest.skip("ShardClient doesn't support get_client")
@@ -915,7 +917,8 @@ def test_sdiffstore_with_different_keys_versions_without_initial_set_in_version(
         assert cache.sdiffstore("foo3", "foo1", "foo2", version_keys=2) == 0
 
     def test_sdiffstore_with_different_keys_versions_with_initial_set_in_version(
-        self, cache: RedisCache
+        self,
+        cache: RedisCache,
     ):
         if isinstance(cache.client, ShardClient):
             pytest.skip("ShardClient doesn't support get_client")
@@ -1000,7 +1003,7 @@ def test_sscan_iter(self, cache: RedisCache):
     def test_sscan_iter_with_match(self, cache: RedisCache):
         if cache.client._has_compression_enabled():
             pytest.skip(
-                "Compression is enabled, sscan_iter with match is not supported"
+                "Compression is enabled, sscan_iter with match is not supported",
             )
         cache.sadd("foo", "bar1", "bar2", "zoo")
         items = cache.sscan_iter("foo", match="bar*")

tests/test_cache_options.py

@@ -38,7 +38,8 @@ def test_get_django_omit_exceptions_many_returns_default_arg(
 
 
 def test_get_django_omit_exceptions(
-    caplog: LogCaptureFixture, ignore_exceptions_cache: RedisCache
+    caplog: LogCaptureFixture,
+    ignore_exceptions_cache: RedisCache,
 ):
     assert ignore_exceptions_cache._ignore_exceptions is True
     assert ignore_exceptions_cache._log_ignored_exceptions is True
@@ -92,7 +93,9 @@ def with_prefix_cache() -> Iterable[RedisCache]:
 
 class TestDjangoRedisCacheEscapePrefix:
     def test_delete_pattern(
-        self, key_prefix_cache: RedisCache, with_prefix_cache: RedisCache
+        self,
+        key_prefix_cache: RedisCache,
+        with_prefix_cache: RedisCache,
     ):
         key_prefix_cache.set("a", "1")
         with_prefix_cache.set("b", "2")
@@ -101,7 +104,9 @@ def test_delete_pattern(
         assert with_prefix_cache.get("b") == "2"
 
     def test_iter_keys(
-        self, key_prefix_cache: RedisCache, with_prefix_cache: RedisCache
+        self,
+        key_prefix_cache: RedisCache,
+        with_prefix_cache: RedisCache,
     ):
         if isinstance(key_prefix_cache.client, ShardClient):
             pytest.skip("ShardClient doesn't support iter_keys")