💥 remove Python 3.7 support (#1148)

nonebot/drivers/_block_driver.py

@@ -1,7 +1,7 @@
 import signal
 import asyncio
 import threading
-from typing import Set, Union, Callable, Awaitable
+from typing import Set, Union, Callable, Awaitable, cast
 
 from nonebot.log import logger
 from nonebot.drivers import Driver
@@ -9,8 +9,7 @@ from nonebot.typing import overrides
 from nonebot.config import Env, Config
 from nonebot.utils import run_sync, is_coroutine_callable
 
-STARTUP_FUNC = Callable[[], Union[None, Awaitable[None]]]
-SHUTDOWN_FUNC = Callable[[], Union[None, Awaitable[None]]]
+HOOK_FUNC = Union[Callable[[], None], Callable[[], Awaitable[None]]]
 HANDLED_SIGNALS = (
     signal.SIGINT,  # Unix signal 2. Sent by Ctrl+C.
     signal.SIGTERM,  # Unix signal 15. Sent by `kill <pid>`.
@@ -20,8 +19,8 @@ HANDLED_SIGNALS = (
 class BlockDriver(Driver):
     def __init__(self, env: Env, config: Config):
         super().__init__(env, config)
-        self.startup_funcs: Set[STARTUP_FUNC] = set()
-        self.shutdown_funcs: Set[SHUTDOWN_FUNC] = set()
+        self.startup_funcs: Set[HOOK_FUNC] = set()
+        self.shutdown_funcs: Set[HOOK_FUNC] = set()
         self.should_exit: asyncio.Event = asyncio.Event()
         self.force_exit: bool = False
 
@@ -38,7 +37,7 @@ class BlockDriver(Driver):
         return logger
 
     @overrides(Driver)
-    def on_startup(self, func: STARTUP_FUNC) -> STARTUP_FUNC:
+    def on_startup(self, func: HOOK_FUNC) -> HOOK_FUNC:
         """
         注册一个启动时执行的函数
         """
@@ -46,7 +45,7 @@ class BlockDriver(Driver):
         return func
 
     @overrides(Driver)
-    def on_shutdown(self, func: SHUTDOWN_FUNC) -> SHUTDOWN_FUNC:
+    def on_shutdown(self, func: HOOK_FUNC) -> HOOK_FUNC:
         """
         注册一个停止时执行的函数
         """
@@ -71,7 +70,9 @@ class BlockDriver(Driver):
     async def startup(self):
         # run startup
         cors = [
-            startup() if is_coroutine_callable(startup) else run_sync(startup)()
+            cast(Callable[..., Awaitable[None]], startup)()
+            if is_coroutine_callable(startup)
+            else run_sync(startup)()
             for startup in self.startup_funcs
         ]
         if cors:
@@ -94,7 +95,9 @@ class BlockDriver(Driver):
         logger.info("Waiting for application shutdown.")
         # run shutdown
         cors = [
-            shutdown() if is_coroutine_callable(shutdown) else run_sync(shutdown)()
+            cast(Callable[..., Awaitable[None]], shutdown)()
+            if is_coroutine_callable(shutdown)
+            else run_sync(shutdown)()
             for shutdown in self.shutdown_funcs
         ]
         if cors:

nonebot/drivers/fastapi.py

@@ -9,7 +9,9 @@ FrontMatter:
     description: nonebot.drivers.fastapi 模块
 """
 
+
 import logging
+import contextlib
 from functools import wraps
 from typing import Any, List, Tuple, Union, Callable, Optional
 
@@ -186,14 +188,12 @@ class Driver(ReverseDriver):
         setup: HTTPServerSetup,
     ) -> Response:
         json: Any = None
-        try:
+        with contextlib.suppress(Exception):
             json = await request.json()
-        except Exception:
-            pass
 
         data: Optional[dict] = None
         files: Optional[List[Tuple[str, FileTypes]]] = None
-        try:
+        with contextlib.suppress(Exception):
             form = await request.form()
             data = {}
             files = []
@@ -204,8 +204,7 @@ class Driver(ReverseDriver):
                     )
                 else:
                     data[key] = value
-        except Exception:
-            pass
+
         http_request = BaseRequest(
             request.method,
             str(request.url),
@@ -219,7 +218,9 @@ class Driver(ReverseDriver):
         )
 
         response = await setup.handle_func(http_request)
-        return Response(response.content, response.status_code, dict(response.headers))
+        return Response(
+            response.content, response.status_code, dict(response.headers.items())
+        )
 
     async def _handle_ws(self, websocket: WebSocket, setup: WebSocketServerSetup):
         request = BaseRequest(