Fix issues with the latest black, mypy, and pytest

This allows the tox tests to pass once again.

Author: pgjones

setup.cfg

@@ -1,5 +1,5 @@
 [flake8]
-ignore = E203, E252, FI58, W503, W504
+ignore = E203, E252, E704, FI58, W503, W504
 max_line_length = 100
 min_version = 3.8
 per-file-ignores =

src/quart/app.py

@@ -310,22 +310,22 @@ def __init__(
         )
 
         self.after_serving_funcs: list[Callable[[], Awaitable[None]]] = []
-        self.after_websocket_funcs: dict[
-            AppOrBlueprintKey, list[AfterWebsocketCallable]
-        ] = defaultdict(list)
+        self.after_websocket_funcs: dict[AppOrBlueprintKey, list[AfterWebsocketCallable]] = (
+            defaultdict(list)
+        )
         self.background_tasks: WeakSet[asyncio.Task] = WeakSet()
         self.before_serving_funcs: list[Callable[[], Awaitable[None]]] = []
-        self.before_websocket_funcs: dict[
-            AppOrBlueprintKey, list[BeforeWebsocketCallable]
-        ] = defaultdict(list)
-        self.teardown_websocket_funcs: dict[
-            AppOrBlueprintKey, list[TeardownCallable]
-        ] = defaultdict(list)
+        self.before_websocket_funcs: dict[AppOrBlueprintKey, list[BeforeWebsocketCallable]] = (
+            defaultdict(list)
+        )
+        self.teardown_websocket_funcs: dict[AppOrBlueprintKey, list[TeardownCallable]] = (
+            defaultdict(list)
+        )
         self.while_serving_gens: list[AsyncGenerator[None, None]] = []
 
         self.template_context_processors[None] = [_default_template_ctx_processor]
 
-        self.cli = AppGroup()  # type: ignore[assignment]
+        self.cli = AppGroup()
         self.cli.name = self.name
 
         if self.has_static_folder:
@@ -1092,12 +1092,10 @@ def log_exception(
             self.logger.error("Exception", exc_info=exception_info)
 
     @overload
-    def ensure_async(self, func: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]:
-        ...
+    def ensure_async(self, func: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]: ...
 
     @overload
-    def ensure_async(self, func: Callable[P, T]) -> Callable[P, Awaitable[T]]:
-        ...
+    def ensure_async(self, func: Callable[P, T]) -> Callable[P, Awaitable[T]]: ...
 
     def ensure_async(
         self, func: Union[Callable[P, Awaitable[T]], Callable[P, T]]
@@ -1356,7 +1354,7 @@ async def make_response(self, result: ResponseReturnValue | HTTPException) -> Re
             ):
                 response = self.response_class(value)
             elif isinstance(value, (list, dict)):
-                response = self.json.response(value)
+                response = self.json.response(value)  # type: ignore[assignment]
             else:
                 raise TypeError(f"The response value type ({type(value).__name__}) is not valid")
         else:
@@ -1503,7 +1501,7 @@ async def dispatch_request(
             return await self.make_default_options_response()
 
         handler = self.view_functions[request_.url_rule.endpoint]
-        return await self.ensure_async(handler)(**request_.view_args)
+        return await self.ensure_async(handler)(**request_.view_args)  # type: ignore
 
     async def dispatch_websocket(
         self, websocket_context: WebsocketContext | None = None
@@ -1519,7 +1517,7 @@ async def dispatch_websocket(
             self.raise_routing_exception(websocket_)
 
         handler = self.view_functions[websocket_.url_rule.endpoint]
-        return await self.ensure_async(handler)(**websocket_.view_args)
+        return await self.ensure_async(handler)(**websocket_.view_args)  # type: ignore
 
     async def finalize_request(
         self,

src/quart/blueprints.py

@@ -55,15 +55,15 @@ class Blueprint(SansioBlueprint):
     def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
         super().__init__(*args, **kwargs)
 
-        self.cli = AppGroup()  # type: ignore[assignment]
+        self.cli = AppGroup()
         self.cli.name = self.name
 
-        self.after_websocket_funcs: t.Dict[
-            AppOrBlueprintKey, t.List[AfterWebsocketCallable]
-        ] = defaultdict(list)
-        self.before_websocket_funcs: t.Dict[
-            AppOrBlueprintKey, t.List[BeforeWebsocketCallable]
-        ] = defaultdict(list)
+        self.after_websocket_funcs: t.Dict[AppOrBlueprintKey, t.List[AfterWebsocketCallable]] = (
+            defaultdict(list)
+        )
+        self.before_websocket_funcs: t.Dict[AppOrBlueprintKey, t.List[BeforeWebsocketCallable]] = (
+            defaultdict(list)
+        )
 
     def get_send_file_max_age(self, filename: str | None) -> int | None:
         """Used by :func:`send_file` to determine the ``max_age`` cache
@@ -279,7 +279,7 @@ def before():
                 ...
 
         """
-        self.record_once(lambda state: state.app.before_websocket(func))
+        self.record_once(lambda state: state.app.before_websocket(func))  # type: ignore
         return func
 
     @setupmethod
@@ -297,7 +297,7 @@ def before():
                 ...
 
         """
-        self.record_once(lambda state: state.app.before_serving(func))
+        self.record_once(lambda state: state.app.before_serving(func))  # type: ignore
         return func
 
     @setupmethod
@@ -315,7 +315,7 @@ def after_app_websocket(self, func: T_after_websocket) -> T_after_websocket:
             def after():
                 ...
         """
-        self.record_once(lambda state: state.app.after_websocket(func))
+        self.record_once(lambda state: state.app.after_websocket(func))  # type: ignore[attr-defined]
         return func
 
     @setupmethod
@@ -332,7 +332,7 @@ def after_app_serving(self, func: T_after_serving) -> T_after_serving:
             def after():
                 ...
         """
-        self.record_once(lambda state: state.app.after_serving(func))
+        self.record_once(lambda state: state.app.after_serving(func))  # type: ignore[attr-defined]
         return func
 
     @setupmethod
@@ -351,7 +351,7 @@ async def func():
                 ...  # Shutdown
 
         """
-        self.record_once(lambda state: state.app.while_serving(func))
+        self.record_once(lambda state: state.app.while_serving(func))  # type: ignore[attr-defined]
         return func
 
     @setupmethod
@@ -370,7 +370,7 @@ def teardown_app_websocket(self, func: T_teardown) -> T_teardown:
             def teardown():
                 ...
         """
-        self.record_once(lambda state: state.app.teardown_websocket(func))
+        self.record_once(lambda state: state.app.teardown_websocket(func))  # type: ignore
         return func
 
     def _merge_blueprint_funcs(self, app: App, name: str) -> None:

src/quart/ctx.py

@@ -215,7 +215,6 @@ async def __aenter__(self) -> WebsocketContext:
 
 
 class AppContext:
-
     """The context relating to the app bound to the current task.
 
     Do not use directly, prefer the

src/quart/sessions.py

@@ -157,8 +157,9 @@ async def open_session(
         cookie = request.cookies.get(self.get_cookie_name(app))
         if cookie is None:
             return self.session_class()
+        max_age = int(app.permanent_session_lifetime.total_seconds())
         try:
-            data = signer.loads(cookie, max_age=app.permanent_session_lifetime.total_seconds())
+            data = signer.loads(cookie, max_age=max_age)
             return self.session_class(data)
         except BadSignature:
             return self.session_class()

src/quart/testing/utils.py

@@ -146,8 +146,7 @@ def make_test_scope(
     scope_base: dict | None,
     *,
     _preserve_context: bool = False,
-) -> HTTPScope:
-    ...
+) -> HTTPScope: ...
 
 
 @overload
@@ -163,8 +162,7 @@ def make_test_scope(
     scope_base: dict | None,
     *,
     _preserve_context: bool = False,
-) -> WebsocketScope:
-    ...
+) -> WebsocketScope: ...
 
 
 def make_test_scope(