c2cwsgiutils 6.2.0.dev74__py3-none-any.whl → 6.2.0.dev75__py3-none-any.whl

c2cwsgiutils/index.py

@@ -1,7 +1,7 @@
 import logging
 import urllib.parse
 import warnings
-from typing import Any, Optional, Union, cast
+from typing import Any, cast
 
 import jwt
 import pyramid.config
@@ -44,22 +44,20 @@ from c2cwsgiutils.config_utils import env_or_settings
 
 _LOG = logging.getLogger(__name__)
 
-additional_title: Optional[str] = None
+additional_title: str | None = None
 additional_noauth: list[str] = []
 additional_auth: list[str] = []
 _ELEM_ID = 0
 
 
-def _url(
-    request: pyramid.request.Request, route: str, params: Optional[dict[str, str]] = None
-) -> Optional[str]:
+def _url(request: pyramid.request.Request, route: str, params: dict[str, str] | None = None) -> str | None:
     try:
-        return request.route_url(route, _query=params)  # type: ignore
+        return request.route_url(route, _query=params)  # type: ignore[no-any-return]
     except KeyError:
         return None
 
 
-def section(title: str, *content: str, sep: Optional[bool] = True) -> str:
+def section(title: str, *content: str, sep: bool | None = True) -> str:
     """Get an HTML section."""
     printable_content = "\n".join(content)
     result = f"""
@@ -73,7 +71,7 @@ def section(title: str, *content: str, sep: Optional[bool] = True) -> str:
     return result
 
 
-def paragraph(*content: str, title: Optional[str] = None) -> str:
+def paragraph(*content: str, title: str | None = None) -> str:
     """Get an HTML paragraph."""
     body = ""
     if title:
@@ -82,7 +80,7 @@ def paragraph(*content: str, title: Optional[str] = None) -> str:
     return "<p>" + body + "</p>"
 
 
-def link(url: Optional[str], label: str, cssclass: str = "btn btn-primary", target: str = "_blank") -> str:
+def link(url: str | None, label: str, cssclass: str = "btn btn-primary", target: str = "_blank") -> str:
     """Get an HTML link."""
     attrs = ""
     if cssclass:
@@ -91,11 +89,10 @@ def link(url: Optional[str], label: str, cssclass: str = "btn btn-primary", targ
         attrs += f' target="{target}"'
     if url is not None:
         return f'<a href="{url}"{attrs}>{label}</a>'
-    else:
-        return ""
+    return ""
 
 
-def form(url: Optional[str], *content: str, method: str = "get", target: str = "_blank") -> str:
+def form(url: str | None, *content: str, method: str = "get", target: str = "_blank") -> str:
     """Get an HTML form."""
     assert url is not None
     method_attrs = ""
@@ -109,9 +106,7 @@ def form(url: Optional[str], *content: str, method: str = "get", target: str = "
     """
 
 
-def input_(
-    name: str, label: Optional[str] = None, type_: Optional[str] = None, value: Union[str, int] = ""
-) -> str:
+def input_(name: str, label: str | None = None, type_: str | None = None, value: str | int = "") -> str:
     """Get an HTML input."""
     global _ELEM_ID  # pylint: disable=global-statement
     id_ = _ELEM_ID
@@ -214,16 +209,14 @@ def _versions(request: pyramid.request.Request) -> str:
     versions_url = _url(request, "c2c_versions")
     if versions_url:
         return section("Versions " + link(versions_url, "Get"), sep=False)
-    else:
-        return ""
+    return ""
 
 
 def _stats(request: pyramid.request.Request) -> str:
     stats_url = _url(request, "c2c_read_stats_json")
     if stats_url:
         return section("Statistics", paragraph(link(stats_url, "Get")), sep=False)
-    else:
-        return ""
+    return ""
 
 
 def _profiler(request: pyramid.request.Request) -> str:
@@ -236,12 +229,11 @@ def _profiler(request: pyramid.request.Request) -> str:
                     link(sql_profiler_url, "Status"),
                     link(sql_profiler_url + "?enable=1", "Enable"),
                     link(sql_profiler_url + "?enable=0", "Disable"),
-                ]
+                ],
             ),
             sep=False,
         )
-    else:
-        return ""
+    return ""
 
 
 def _db_maintenance(request: pyramid.request.Request) -> str:
@@ -262,8 +254,7 @@ def _db_maintenance(request: pyramid.request.Request) -> str:
             ),
             sep=False,
         )
-    else:
-        return ""
+    return ""
 
 
 def _logging(request: pyramid.request.Request) -> str:
@@ -285,8 +276,7 @@ def _logging(request: pyramid.request.Request) -> str:
             paragraph(link(logging_url, "List overrides")),
             sep=False,
         )
-    else:
-        return ""
+    return ""
 
 
 def _debug(request: pyramid.request.Request) -> str:
@@ -300,7 +290,7 @@ def _debug(request: pyramid.request.Request) -> str:
                     link(_url(request, "c2c_debug_stacks"), "Stack traces"),
                     link(_url(request, "c2c_debug_headers"), "HTTP headers"),
                     link(_url(request, "c2c_debug_memory_maps"), "Mapped memory"),
-                ]
+                ],
             ),
             '<h2>Memory usage<span style="font-size: 0.5em;">, with <a href="https://mg.pov.lt/objgraph/">objgraph</a></span></h2>',
             "<p>Runs the garbage collector and dumps the memory usage as JSON.</p>",
@@ -345,8 +335,7 @@ def _debug(request: pyramid.request.Request) -> str:
             ),
             sep=False,
         )
-    else:
-        return ""
+    return ""
 
 
 def _health_check(request: pyramid.request.Request) -> str:
@@ -362,8 +351,7 @@ def _health_check(request: pyramid.request.Request) -> str:
             ),
             sep=False,
         )
-    else:
-        return ""
+    return ""
 
 
 def _github_login(request: pyramid.request.Request) -> dict[str, Any]:
@@ -391,7 +379,10 @@ def _github_login(request: pyramid.request.Request) -> dict[str, Any]:
     )
     authorization_url, state = oauth.authorization_url(
         env_or_settings(
-            settings, GITHUB_AUTH_URL_ENV, GITHUB_AUTH_URL_PROP, "https://github.com/login/oauth/authorize"
+            settings,
+            GITHUB_AUTH_URL_ENV,
+            GITHUB_AUTH_URL_PROP,
+            "https://github.com/login/oauth/authorize",
         ),
     )
     use_session = env_or_settings(settings, USE_SESSION_ENV, USE_SESSION_PROP, "").lower() == "true"
@@ -451,7 +442,7 @@ def _github_login_callback(request: pyramid.request.Request) -> dict[str, Any]:
             GITHUB_USER_URL_ENV,
             GITHUB_USER_URL_PROP,
             "https://api.github.com/user",
-        )
+        ),
     ).json()
 
     user_information: UserDetails = {
@@ -495,7 +486,8 @@ def _github_logout(request: pyramid.request.Request) -> dict[str, Any]:
         ),
     )
     raise HTTPFound(
-        location=request.params.get("came_from", _url(request, "c2c_index")), headers=request.response.headers
+        location=request.params.get("came_from", _url(request, "c2c_index")),
+        headers=request.response.headers,
     )
 
 
@@ -515,7 +507,10 @@ def includeme(config: pyramid.config.Configurator) -> None:
         config.add_view(_index, route_name="c2c_index", http_cache=0, renderer="./templates/index.html.mako")
         config.add_route("c2c_index_slash", base_path + "/", request_method=("GET", "POST"))
         config.add_view(
-            _index, route_name="c2c_index_slash", http_cache=0, renderer="./templates/index.html.mako"
+            _index,
+            route_name="c2c_index_slash",
+            http_cache=0,
+            renderer="./templates/index.html.mako",
         )
 
         settings = config.get_settings()
@@ -523,7 +518,7 @@ def includeme(config: pyramid.config.Configurator) -> None:
         if auth_type_ == AuthenticationType.SECRET:
             _LOG.warning(
                 "It is recommended to use OAuth2 with GitHub login instead of the `C2C_SECRET` because it "
-                "protects from brute force attacks and the access grant is personal and can be revoked."
+                "protects from brute force attacks and the access grant is personal and can be revoked.",
             )
 
         if auth_type_ == AuthenticationType.GITHUB:
@@ -531,7 +526,10 @@ def includeme(config: pyramid.config.Configurator) -> None:
             config.add_view(_github_login, route_name="c2c_github_login", http_cache=0)
             config.add_route("c2c_github_callback", base_path + "/github-callback", request_method=("GET",))
             config.add_view(
-                _github_login_callback, route_name="c2c_github_callback", http_cache=0, renderer="fast_json"
+                _github_login_callback,
+                route_name="c2c_github_callback",
+                http_cache=0,
+                renderer="fast_json",
             )
             config.add_route("c2c_github_logout", base_path + "/github-logout", request_method=("GET",))
             config.add_view(_github_logout, route_name="c2c_github_logout", http_cache=0)

c2cwsgiutils/loader.py

@@ -1,5 +1,5 @@
 import logging.config
-from typing import Optional, cast
+from typing import cast
 
 from plaster_pastedeploy import Loader as BaseLoader
 
@@ -8,10 +8,10 @@ from c2cwsgiutils import get_config_defaults, get_logconfig_dict
 _LOG = logging.getLogger(__name__)
 
 
-class Loader(BaseLoader):  # type: ignore
+class Loader(BaseLoader):  # type: ignore[misc]
     """The application loader."""
 
-    def _get_defaults(self, defaults: Optional[dict[str, str]] = None) -> dict[str, str]:
+    def _get_defaults(self, defaults: dict[str, str] | None = None) -> dict[str, str]:
         d = get_config_defaults()
         d.update(defaults or {})
         return cast(dict[str, str], super()._get_defaults(d))
@@ -20,7 +20,7 @@ class Loader(BaseLoader):  # type: ignore
         """Get the object representation."""
         return f'c2cwsgiutils.loader.Loader(uri="{self.uri}")'
 
-    def setup_logging(self, defaults: Optional[dict[str, str]] = None) -> None:
+    def setup_logging(self, defaults: dict[str, str] | None = None) -> None:
         """
         Set up logging via :func:`logging.config.dictConfig` with value returned from c2cwsgiutils.get_logconfig_dict.
 
@@ -34,6 +34,7 @@ class Loader(BaseLoader):  # type: ignore
             :func:`logging.config.fileConfig`.
 
         """
+        del defaults  # Unused
         if "loggers" in self.get_sections():
             logging.config.dictConfig(get_logconfig_dict(self.uri.path))
         else:

c2cwsgiutils/logging_view.py

@@ -23,10 +23,15 @@ def includeme(config: pyramid.config.Configurator) -> None:
     """Install the view to configure the loggers, if configured to do so."""
     if auth.is_enabled(config, _ENV_KEY, _CONFIG_KEY):
         config.add_route(
-            "c2c_logging_level", config_utils.get_base_path(config) + r"/logging/level", request_method="GET"
+            "c2c_logging_level",
+            config_utils.get_base_path(config) + r"/logging/level",
+            request_method="GET",
         )
         config.add_view(
-            _logging_change_level, route_name="c2c_logging_level", renderer="fast_json", http_cache=0
+            _logging_change_level,
+            route_name="c2c_logging_level",
+            renderer="fast_json",
+            http_cache=0,
         )
         _restore_overrides(config)
         _LOG.info("Enabled the /logging/level API")
@@ -40,7 +45,10 @@ def _logging_change_level(request: pyramid.request.Request) -> Mapping[str, Any]
         logger = logging.getLogger(name)
         if level is not None:
             _LOG.critical(
-                "Logging of %s changed from %s to %s", name, logging.getLevelName(logger.level), level
+                "Logging of %s changed from %s to %s",
+                name,
+                logging.getLevelName(logger.level),
+                level,
             )
             _set_level(name=name, level=level)
             _store_override(request.registry.settings, name, level)
@@ -50,8 +58,7 @@ def _logging_change_level(request: pyramid.request.Request) -> Mapping[str, Any]
             "level": logging.getLevelName(logger.level),
             "effective_level": logging.getLevelName(logger.getEffectiveLevel()),
         }
-    else:
-        return {"status": 200, "overrides": dict(_list_overrides(request.registry.settings))}
+    return {"status": 200, "overrides": dict(_list_overrides(request.registry.settings))}
 
 
 @broadcast.decorator(expect_answers=True)
@@ -67,7 +74,7 @@ def _restore_overrides(config: pyramid.config.Configurator) -> None:
             logging.getLogger(name).setLevel(level)
     except ImportError:
         pass  # don't have redis
-    except Exception:  # pylint: disable=broad-except
+    except Exception:  # pylint: disable=broad-exception-caught
         # survive an error there. Logging levels is not business critical...
         _LOG.warning("Cannot restore logging levels", exc_info=True)
 

c2cwsgiutils/models_graph.py

@@ -24,7 +24,7 @@ def _generate_model_graph(module: Any, base: Any) -> None:
         """
     digraph {
         rankdir=BT;
-    """
+    """,
     )
 
     interesting = {
@@ -34,7 +34,7 @@ def _generate_model_graph(module: Any, base: Any) -> None:
     }
 
     for symbol in list(interesting):
-        symbol = getattr(module, symbol.__name__)
+        symbol = getattr(module, symbol.__name__)  # noqa: PLW2901
         if _is_interesting(symbol, base):
             _print_node(symbol, interesting)
 
@@ -56,7 +56,7 @@ def _is_interesting(what: Any, base: type) -> bool:
 
 
 def _get_table_desc(symbol: Any) -> str:
-    cols = [symbol.__name__, ""] + _get_local_cols(symbol)
+    cols = [symbol.__name__, "", *_get_local_cols(symbol)]
 
     return "\\n".join(cols)
 
@@ -70,7 +70,7 @@ def _get_all_cols(symbol: Any) -> list[str]:
             # Those are not fields
             pass
         elif isinstance(member, sa.sql.schema.SchemaItem):
-            cols.append(member_name + ("[null]" if member.nullable else ""))  # type: ignore
+            cols.append(member_name + ("[null]" if member.nullable else ""))  # type: ignore[attr-defined]
         elif isinstance(member, sa.orm.attributes.InstrumentedAttribute):
             nullable = (
                 member.property.columns[0].nullable
@@ -88,4 +88,4 @@ def _get_local_cols(symbol: Any) -> list[str]:
     for parent in symbol.__bases__:
         result -= set(_get_all_cols(parent))
 
-    return sorted(list(result))
+    return sorted(result)

c2cwsgiutils/pretty_json.py

@@ -35,7 +35,7 @@ def init(config: pyramid.config.Configurator) -> None:
 def includeme(config: pyramid.config.Configurator) -> None:
     """Initialize json and fast_json renderer."""
     pretty_print = config_bool(
-        env_or_config(config, "C2C_JSON_PRETTY_PRINT", "c2c.json.pretty_print", "false")
+        env_or_config(config, "C2C_JSON_PRETTY_PRINT", "c2c.json.pretty_print", "false"),
     )
     sort_keys = config_bool(env_or_config(config, "C2C_JSON_SORT_KEYS", "c2c.json.sort_keys", "false"))
 
@@ -44,6 +44,7 @@ def includeme(config: pyramid.config.Configurator) -> None:
     config.add_renderer("json", JSON(indent=2 if pretty_print else None, sort_keys=sort_keys))
     config.add_renderer("fast_json", JSON(serializer=fast_dump))
     config.add_renderer(
-        "cornice_json", CorniceRenderer(indent=2 if pretty_print else None, sort_keys=sort_keys)
+        "cornice_json",
+        CorniceRenderer(indent=2 if pretty_print else None, sort_keys=sort_keys),
     )
     config.add_renderer("cornice_fast_json", CorniceRenderer(serializer=fast_dump))

c2cwsgiutils/profiler.py

@@ -2,7 +2,6 @@ import contextlib
 import cProfile
 import pstats
 import sys
-from typing import Any
 
 
 class Profile(contextlib.ContextDecorator):
@@ -17,7 +16,7 @@ class Profile(contextlib.ContextDecorator):
     def __enter__(self) -> None:
         self.pr.enable()
 
-    def __exit__(self, *exc: Any) -> None:
+    def __exit__(self, *exc: object) -> None:
         del exc
 
         self.pr.disable()

c2cwsgiutils/prometheus.py

@@ -4,7 +4,7 @@ import os
 import re
 import resource
 from collections.abc import Generator, Iterable
-from typing import Any, Optional, TypedDict, cast
+from typing import Any, TypedDict, cast
 
 import prometheus_client
 import prometheus_client.core
@@ -37,7 +37,7 @@ def start_single_process() -> None:
         prometheus_client.start_http_server(int(os.environ["C2C_PROMETHEUS_PORT"]))
 
 
-def start(registry: Optional[prometheus_client.CollectorRegistry] = None) -> None:
+def start(registry: prometheus_client.CollectorRegistry | None = None) -> None:
     """Start separate HTTP server to provide the Prometheus metrics."""
     if os.environ.get("C2C_PROMETHEUS_PORT") is not None:
         broadcast.includeme()
@@ -114,7 +114,7 @@ def serialize_collected_data(collector: prometheus_client.registry.Collector) ->
         elif isinstance(process_gauge, prometheus_client.core.CounterMetricFamily):
             gauge["type"] = "counter"
         else:
-            raise NotImplementedError()
+            raise NotImplementedError
         for sample in process_gauge.samples:
             gauge["samples"].append(
                 {
@@ -153,12 +153,12 @@ def _deserialize_collected_data(
 
             if serialized_metric["type"] == "gauge":
                 metric: prometheus_client.core.Metric = prometheus_client.core.GaugeMetricFamily(
-                    **serialized_metric["args"]
+                    **serialized_metric["args"],
                 )
             elif serialized_metric["type"] == "counter":
                 metric = prometheus_client.core.CounterMetricFamily(**serialized_metric["args"])
             else:
-                raise NotImplementedError()
+                raise NotImplementedError
             for sample in serialized_metric["samples"]:
                 metric.samples.append(
                     prometheus_client.metrics_core.Sample(**sample),  # type: ignore[attr-defined]
@@ -169,7 +169,7 @@ def _deserialize_collected_data(
 class MemoryMapCollector(prometheus_client.registry.Collector):
     """The Linux memory map provider."""
 
-    def __init__(self, memory_type: str = "pss", pids: Optional[list[str]] = None):
+    def __init__(self, memory_type: str = "pss", pids: list[str] | None = None) -> None:
         """
         Initialize.
 

c2cwsgiutils/pyramid.py

@@ -33,7 +33,7 @@ def includeme(config: pyramid.config.Configurator) -> None:
         config: The pyramid Configuration
 
     """
-    logging.captureWarnings(True)
+    logging.captureWarnings(capture=True)
     config.include(coverage_setup.includeme)
     config.include(sentry.includeme)
     config.add_settings(handle_exceptions=False)

c2cwsgiutils/pyramid_logging.py

@@ -16,7 +16,7 @@ import logging
 import logging.config
 import socket
 from collections.abc import Mapping, MutableMapping
-from typing import TYPE_CHECKING, Any, Optional, TextIO
+from typing import TYPE_CHECKING, Any, TextIO
 
 import cee_syslog_handler
 from pyramid.threadlocal import get_current_request
@@ -83,7 +83,7 @@ def _make_message_dict(*args: Any, **kargv: Any) -> Mapping[str, Any]:
     return _un_underscore(msg)
 
 
-class PyramidCeeSysLogHandler(cee_syslog_handler.CeeSysLogHandler):  # type: ignore
+class PyramidCeeSysLogHandler(cee_syslog_handler.CeeSysLogHandler):  # type: ignore[misc]
     """A CEE (JSON format) log handler with additional information about the current request."""
 
     def __init__(self, *args: Any, **kargv: Any) -> None:
@@ -113,7 +113,7 @@ else:
 class JsonLogHandler(Base):
     """Log to stdout in JSON."""
 
-    def __init__(self, stream: Optional[TextIO] = None):
+    def __init__(self, stream: TextIO | None = None) -> None:
         """Initialize the handler."""
         super().__init__(stream)
         self.addFilter(_PYRAMID_FILTER)
@@ -122,6 +122,11 @@ class JsonLogHandler(Base):
     def format(self, record: Any) -> str:
         """Format the record into a JSON string."""
         message = _make_message_dict(
-            record, self._fqdn, debugging_fields=True, extra_fields=True, facility=None, static_fields={}
+            record,
+            self._fqdn,
+            debugging_fields=True,
+            extra_fields=True,
+            facility=None,
+            static_fields={},
         )
         return json.dumps(message)

c2cwsgiutils/redis_stats.py

@@ -1,6 +1,7 @@
 import logging
 import warnings
-from typing import Any, Callable, Optional
+from collections.abc import Callable
+from typing import Any
 
 import prometheus_client
 import pyramid.config
@@ -8,7 +9,7 @@ import pyramid.config
 from c2cwsgiutils import config_utils, prometheus
 
 _LOG = logging.getLogger(__name__)
-_ORIG: Optional[Callable[..., Any]] = None
+_ORIG: Callable[..., Any] | None = None
 
 _PROMETHEUS_REDIS_SUMMARY = prometheus_client.Summary(
     prometheus.build_metric_name("redis"),
@@ -24,23 +25,27 @@ def _execute_command_patch(self: Any, command: str, *args: Any, **options: Any)
         return _ORIG(self, command, *args, **options)
 
 
-def init(config: Optional[pyramid.config.Configurator] = None) -> None:
+def init(config: pyramid.config.Configurator | None = None) -> None:
     """Initialize the Redis tracking, for backward compatibility."""
     warnings.warn("init function is deprecated; use includeme instead", stacklevel=2)
     includeme(config)
 
 
-def includeme(config: Optional[pyramid.config.Configurator] = None) -> None:
+def includeme(config: pyramid.config.Configurator | None = None) -> None:
     """Initialize the Redis tracking."""
     global _ORIG  # pylint: disable=global-statement
     if config_utils.env_or_config(
-        config, "C2C_TRACK_REDIS", "c2c.track_redis", True, config_utils.config_bool
+        config,
+        "C2C_TRACK_REDIS",
+        "c2c.track_redis",
+        default=True,
+        type_=config_utils.config_bool,
     ):
         try:
             import redis.client  # pylint: disable=import-outside-toplevel
 
             _ORIG = redis.client.Redis.execute_command
-            redis.client.Redis.execute_command = _execute_command_patch  # type: ignore
+            redis.client.Redis.execute_command = _execute_command_patch  # type: ignore[method-assign,assignment]
             _LOG.info("Enabled the redis tracking")
-        except Exception:  # pragma: nocover  # pylint: disable=broad-except
+        except Exception:  # pragma: nocover  # pylint: disable=broad-exception-caught
             _LOG.warning("Cannot enable redis tracking", exc_info=True)

c2cwsgiutils/redis_utils.py

@@ -27,7 +27,7 @@ _REDIS_DB_KEY_PROP = "c2c.redis_db"
 
 _master: Optional["redis.client.Redis[str]"] = None
 _slave: Optional["redis.client.Redis[str]"] = None
-_sentinel: Optional[redis.sentinel.Sentinel] = None
+_sentinel: redis.sentinel.Sentinel | None = None
 
 
 def cleanup() -> None:
@@ -39,11 +39,11 @@ def cleanup() -> None:
 
 
 def get(
-    settings: Optional[Mapping[str, bytes]] = None,
+    settings: Mapping[str, bytes] | None = None,
 ) -> tuple[
     Optional["redis.client.Redis[str]"],
     Optional["redis.client.Redis[str]"],
-    Optional[redis.sentinel.Sentinel],
+    redis.sentinel.Sentinel | None,
 ]:
     """Get the redis connection instances."""
     if _master is None:
@@ -51,18 +51,24 @@ def get(
     return _master, _slave, _sentinel
 
 
-def _init(settings: Optional[Mapping[str, Any]]) -> None:
+def _init(settings: Mapping[str, Any] | None) -> None:
     global _master, _slave, _sentinel  # pylint: disable=global-statement
     sentinels = c2cwsgiutils.config_utils.env_or_settings(
-        settings, REDIS_SENTINELS_KEY, REDIS_SENTINELS_KEY_PROP
+        settings,
+        REDIS_SENTINELS_KEY,
+        REDIS_SENTINELS_KEY_PROP,
     )
     service_name = c2cwsgiutils.config_utils.env_or_settings(
-        settings, REDIS_SERVICENAME_KEY, REDIS_SERVICENAME_KEY_PROP
+        settings,
+        REDIS_SERVICENAME_KEY,
+        REDIS_SERVICENAME_KEY_PROP,
     )
     db = c2cwsgiutils.config_utils.env_or_settings(settings, _REDIS_DB_KEY, _REDIS_DB_KEY_PROP)
     url = c2cwsgiutils.config_utils.env_or_settings(settings, REDIS_URL_KEY, REDIS_URL_KEY_PROP)
     redis_options_ = c2cwsgiutils.config_utils.env_or_settings(
-        settings, _REDIS_OPTIONS_KEY, _REDIS_OPTIONS_KEY_PROP
+        settings,
+        _REDIS_OPTIONS_KEY,
+        _REDIS_OPTIONS_KEY_PROP,
     )
 
     redis_options = (
@@ -92,14 +98,16 @@ def _init(settings: Optional[Mapping[str, Any]]) -> None:
         _slave = _master
     else:
         _LOG.info(
-            "No Redis configuration found, use %s or %s to configure it", REDIS_URL_KEY, REDIS_SENTINELS_KEY
+            "No Redis configuration found, use %s or %s to configure it",
+            REDIS_URL_KEY,
+            REDIS_SENTINELS_KEY,
         )
 
 
 class PubSubWorkerThread(threading.Thread):
     """A clone of redis.client.PubSubWorkerThread that doesn't die when the connections are broken."""
 
-    def __init__(self, pubsub: redis.client.PubSub, name: Optional[str] = None) -> None:
+    def __init__(self, pubsub: redis.client.PubSub, name: str | None = None) -> None:
         """Initialize the PubSubWorkerThread."""
         super().__init__(name=name, daemon=True)
         self.pubsub = pubsub
@@ -123,7 +131,7 @@ class PubSubWorkerThread(threading.Thread):
                     _LOG.warning("Redis connection problem")
                 last_was_ok = False
                 time.sleep(0.5)
-            except Exception:  # pylint: disable=broad-except
+            except Exception:  # pylint: disable=broad-exception-caught
                 _LOG.warning("Unexpected error", exc_info=True)
         _LOG.info("Redis subscription worker stopped")
         pubsub.close()