Remove typing.Optional in favor of union types

Author: mongkok

debug_toolbar/panels/logging.py

@@ -26,27 +26,20 @@ def __init__(self) -> None:
             )
         self.collections: dict[int, list[dict[str, t.Any]]] = {}
 
-    def get_collection(
-        self,
-        thread_id: t.Optional[int] = None,
-    ) -> list[dict[str, t.Any]]:
+    def get_collection(self, thread_id: int | None = None) -> list[dict[str, t.Any]]:
         if thread_id is None:
             thread_id = threading.get_ident()
         if thread_id not in self.collections:
             self.collections[thread_id] = []
         return self.collections[thread_id]
 
-    def clear_collection(self, thread_id: t.Optional[int] = None) -> None:
+    def clear_collection(self, thread_id: int | None = None) -> None:
         if thread_id is None:
             thread_id = threading.get_ident()
         if thread_id in self.collections:
             del self.collections[thread_id]
 
-    def collect(
-        self,
-        item: dict[str, t.Any],
-        thread_id: t.Optional[int] = None,
-    ) -> None:
+    def collect(self, item: dict[str, t.Any], thread_id: int | None = None) -> None:
         self.get_collection(thread_id).append(item)
 
 

debug_toolbar/panels/tortoise.py

@@ -30,7 +30,7 @@ async def execute_insert(self, query: str, values: list) -> t.Any:
     async def execute_query(
         self,
         query: str,
-        values: t.Optional[list] = None,
+        values: list | None = None,
     ) -> tuple[int, t.Sequence[dict]]:
         with self.on_execute(self.db, query, values):
             return await self.db.execute_query(query, values)
@@ -46,7 +46,7 @@ async def execute_many(self, query: str, values: list[list]) -> None:
     async def execute_query_dict(
         self,
         query: str,
-        values: t.Optional[list] = None,
+        values: list | None = None,
     ) -> list[dict]:
         with self.on_execute(self.db, query, values):
             return await self.db.execute_query_dict(query, values)

debug_toolbar/settings.py

@@ -47,7 +47,7 @@ class DebugToolbarSettings(BaseSettings):
             "want disabled (but still displayed) by default."
         ),
     )
-    ALLOWED_HOSTS: t.Optional[t.Sequence[str]] = Field(
+    ALLOWED_HOSTS: t.Sequence[str] | None = Field(
         None,
         description=(
             "If it's set, the Debug Toolbar is shown only "

debug_toolbar/toolbar.py

@@ -21,7 +21,7 @@
 
 class DebugToolbar:
     _store: "StoreDT" = OrderedDict()
-    _panel_classes: t.Optional[t.Sequence[t.Type[Panel]]] = None
+    _panel_classes: t.Sequence[t.Type[Panel]] | None = None
 
     def __init__(
         self,
@@ -51,7 +51,7 @@ def __init__(
 
         self.stats: Stats = {}
         self.server_timing_stats: dict[str, ServerTiming] = {}
-        self.store_id: t.Optional[str] = None
+        self.store_id: str | None = None
 
     @classmethod
     def get_panel_classes(
@@ -84,7 +84,7 @@ def store(self) -> None:
             self._store.popitem(last=False)
 
     @classmethod
-    def fetch(cls: t.Type[DT], store_id: str) -> t.Optional[DT]:
+    def fetch(cls: t.Type[DT], store_id: str) -> DT | None:
         return cls._store.get(store_id)
 
     async def record_stats(self, response: Response) -> None:

debug_toolbar/utils.py

@@ -38,7 +38,7 @@ def get_name_from_obj(obj: t.Any) -> str:
     return name
 
 
-def matched_route(request: Request) -> t.Optional[APIRoute]:
+def matched_route(request: Request) -> APIRoute | None:
     for route in request.app.routes:
         match, _ = route.matches(request.scope)
 

tests/panels/sqlalchemy/crud.py

@@ -1,5 +1,3 @@
-import typing as t
-
 from sqlalchemy import Column
 from sqlalchemy.orm import Session
 
@@ -13,7 +11,7 @@ def create_user(db: Session, username: str) -> models.User:
     return user
 
 
-def get_user(db: Session, user_id: Column[int]) -> t.Optional[models.User]:
+def get_user(db: Session, user_id: Column[int]) -> models.User | None:
     query = db.query(models.User).filter(models.User.id == user_id)
 
     if query is not None:

tests/testclient.py

@@ -14,7 +14,7 @@ class TestClient(BaseTestClient):
     def get_store_id(
         self,
         path: str,
-        method: t.Optional[str] = None,
+        method: str | None = None,
         **kwargs: t.Any,
     ) -> str:
         response = getattr(self, (method or "get"))(path, **kwargs)