Enabled more rules and restored blind exceptino for lz4 compressor

Author: WisdomPill

.pre-commit-config.yaml

@@ -9,13 +9,15 @@ repos:
   - id: check-symlinks
   - id: debug-statements
 
-- repo: https://github.com/psf/black
-  rev: 23.9.1
-  hooks:
-  - id: black
-
+# from readme - ruff with autofix must run before
+# other formatters, such as black
 - repo: https://github.com/astral-sh/ruff-pre-commit
   rev: v0.0.292
   hooks:
   - id: ruff
     args: [ --fix, --exit-non-zero-on-fix , --show-fixes]
+
+- repo: https://github.com/psf/black
+  rev: 23.9.1
+  hooks:
+  - id: black

.ruff.toml

@@ -49,13 +49,13 @@ select = [
   "T10",
 
   # rules from flake8-django
-  # TODO: "DJ",
+  "DJ",
 
   # rules from flake8-errmsg
    "EM",
 
   # rules from flake8-executable
-  # TODO: "EXE",
+  "EXE",
 
   # rules from flake8-implicit-str-concat
   "ISC",
@@ -85,7 +85,7 @@ select = [
   "RSE",
 
   # rules from flake8-return
-  # TODO: "RET",
+  "RET",
 
   # rules from flake8-self
   # TODO: "SLF",
@@ -106,8 +106,7 @@ select = [
   # TODO: "ARG",
 
   # rules from flake8-use-pathlib
-  # could be enabled easily
-#   TODO: "PTH",
+  "PTH",
 
   # removes unused noqa comments
   "RUF100",

django_redis/client/default.py

@@ -108,8 +108,8 @@ def get_client(
 
         if show_index:
             return self._clients[index], index
-        else:
-            return self._clients[index]
+
+        return self._clients[index]
 
     def connect(self, index: int = 0) -> Redis:
         """
@@ -166,13 +166,13 @@ def set(  # noqa: A003
                             # not expire (in our case delete) the value if it exists.
                             # Obviously expire not existent value is noop.
                             return not self.has_key(key, version=version, client=client)
-                        else:
-                            # redis doesn't support negative timeouts in ex flags
-                            # so it seems that it's better to just delete the key
-                            # than to set it and than expire in a pipeline
-                            return bool(
-                                self.delete(key, client=client, version=version)
-                            )
+
+                        # redis doesn't support negative timeouts in ex flags
+                        # so it seems that it's better to just delete the key
+                        # than to set it and than expire in a pipeline
+                        return bool(
+                            self.delete(key, client=client, version=version)
+                        )
 
                 return bool(client.set(nkey, nvalue, nx=nx, px=timeout, xx=xx))
             except _main_exceptions as e:
@@ -419,7 +419,7 @@ def delete_many(
         keys = [self.make_key(k, version=version) for k in keys]
 
         if not keys:
-            return
+            return None
 
         try:
             return client.delete(*keys)
@@ -459,8 +459,7 @@ def encode(self, value: Any) -> Union[bytes, Any]:
 
         if isinstance(value, bool) or not isinstance(value, int):
             value = self._serializer.dumps(value)
-            value = self._compressor.compress(value)
-            return value
+            return self._compressor.compress(value)
 
         return value
 
@@ -623,13 +622,13 @@ def ttl(
 
         if t >= 0:
             return t
-        elif t == -1:
+        if t == -1:
             return None
-        elif t == -2:
+        if t == -2:
             return 0
-        else:
-            # Should never reach here
-            return None
+
+        # Should never reach here
+        return None
 
     def pttl(self, key, version=None, client=None):
         """
@@ -647,13 +646,13 @@ def pttl(self, key, version=None, client=None):
 
         if t >= 0:
             return t
-        elif t == -1:
+        if t == -1:
             return None
-        elif t == -2:
+        if t == -2:
             return 0
-        else:
-            # Should never reach here
-            return None
+
+        # Should never reach here
+        return None
 
     def has_key(
         self, key: Any, version: Optional[int] = None, client: Optional[Redis] = None
@@ -739,7 +738,7 @@ def make_pattern(
 
         return CacheKey(self._backend.key_func(pattern, prefix, version_str))
 
-    def close(self, **kwargs):
+    def close(self):
         close_flag = self._options.get(
             "CLOSE_CONNECTION",
             getattr(settings, "DJANGO_REDIS_CLOSE_CONNECTION", False),
@@ -774,7 +773,7 @@ def touch(
         key = self.make_key(key, version=version)
         if timeout is None:
             return bool(client.persist(key))
-        else:
-            # Convert to milliseconds
-            timeout = int(timeout * 1000)
-            return bool(client.pexpire(key, timeout))
+
+        # Convert to milliseconds
+        timeout = int(timeout * 1000)
+        return bool(client.pexpire(key, timeout))

django_redis/client/sharded.py

@@ -37,8 +37,7 @@ def get_server_name(self, _key):
         g = self._findhash.match(key)
         if g is not None and len(g.groups()) > 0:
             key = g.groups()[0]
-        name = self._ring.get_node(key)
-        return name
+        return self._ring.get_node(key)
 
     def get_server(self, key):
         name = self.get_server_name(key)

django_redis/compressors/lz4.py

@@ -1,7 +1,8 @@
 from lz4.frame import compress as _compress
 from lz4.frame import decompress as _decompress
 
-from .base import BaseCompressor
+from django_redis.compressors.base import BaseCompressor
+from django_redis.exceptions import CompressorError
 
 
 class Lz4Compressor(BaseCompressor):
@@ -13,4 +14,7 @@ def compress(self, value: bytes) -> bytes:
         return value
 
     def decompress(self, value: bytes) -> bytes:
-        return _decompress(value)
+        try:
+            return _decompress(value)
+        except Exception as e:  # noqa: BLE001
+            raise CompressorError from e

django_redis/pool.py

@@ -68,8 +68,7 @@ def connect(self, url: str) -> Redis:
         return a new connection.
         """
         params = self.make_connection_params(url)
-        connection = self.get_connection(params)
-        return connection
+        return self.get_connection(params)
 
     def disconnect(self, connection):
         """

django_redis/serializers/pickle.py

@@ -23,7 +23,7 @@ def setup_pickle_version(self, options) -> None:
                         f" {pickle.HIGHEST_PROTOCOL}"
                     )
                     raise ImproperlyConfigured(error_message)
-            except (ValueError, TypeError):
+            except (ValueError, TypeError) as e:
                 error_message = "PICKLE_VERSION value must be an integer"
                 raise ImproperlyConfigured(error_message) from e