Merge remote-tracking branch 'origin/use_ruff' into use_ruff

# Conflicts:
#	django_redis/serializers/pickle.py

Author: WisdomPill

django_redis/client/sentinel.py

@@ -37,8 +37,6 @@ def connect(self, *args, **kwargs):
                 "Settings DJANGO_REDIS_CONNECTION_FACTORY or "
                 "CACHE[].OPTIONS.CONNECTION_POOL_CLASS is not configured correctly."
             )
-            raise ImproperlyConfigured(
-                error_message
-            )
+            raise ImproperlyConfigured(error_message)
 
         return connection

django_redis/pool.py

@@ -48,22 +48,16 @@ def make_connection_params(self, url):
 
         socket_timeout = self.options.get("SOCKET_TIMEOUT", None)
         if socket_timeout:
-            if not isinstance(
-                socket_timeout, (int, float)
-            ):
+            if not isinstance(socket_timeout, (int, float)):
                 error_message = "Socket timeout should be float or integer"
                 raise ImproperlyConfigured(error_message)
             kwargs["socket_timeout"] = socket_timeout
 
         socket_connect_timeout = self.options.get("SOCKET_CONNECT_TIMEOUT", None)
         if socket_connect_timeout:
-            if not isinstance(
-                socket_connect_timeout, (int, float)
-            ):
+            if not isinstance(socket_connect_timeout, (int, float)):
                 error_message = "Socket connect timeout should be float or integer"
-                raise ImproperlyConfigured(
-                    error_message
-                )
+                raise ImproperlyConfigured(error_message)
             kwargs["socket_connect_timeout"] = socket_connect_timeout
 
         return kwargs
@@ -147,9 +141,7 @@ def __init__(self, options):
         sentinels = options.get("SENTINELS")
         if not sentinels:
             error_message = "SENTINELS must be provided as a list of (host, port)."
-            raise ImproperlyConfigured(
-                error_message
-            )
+            raise ImproperlyConfigured(error_message)
 
         # provide the connection pool kwargs to the sentinel in case it
         # needs to use the socket options for the sentinels themselves

django_redis/serializers/pickle.py

@@ -22,10 +22,8 @@ def setup_pickle_version(self, options) -> None:
                         f"PICKLE_VERSION can't be higher than pickle.HIGHEST_PROTOCOL:"
                         f" {pickle.HIGHEST_PROTOCOL}"
                     )
-                    raise ImproperlyConfigured(
-                        error_message
-                    )
-            except (ValueError, TypeError) as e:
+                    raise ImproperlyConfigured(error_message)
+            except (ValueError, TypeError):
                 error_message = "PICKLE_VERSION value must be an integer"
                 raise ImproperlyConfigured(error_message) from e