From 1dbbd5977d828fe4e5773085eae38b1a1ae8574b Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Thu, 12 Nov 2026 05:05:59 +0900 Subject: [PATCH] chore: drop Optional annotation --- dzgui/api/servers.py | 6 +++--- dzgui/views/trees/tree_base.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dzgui/api/servers.py b/dzgui/api/servers.py index 546ec15..5fa219c 100644 --- a/dzgui/api/servers.py +++ b/dzgui/api/servers.py @@ -9,7 +9,7 @@ import subprocess import threading from dataclasses import dataclass -from typing import Any, Optional, TYPE_CHECKING, Union +from typing import Any, TYPE_CHECKING, Union from dzgui.const.constants import APP_NAME, REQUEST_TIMEOUT from dzgui.const.endpoints import STEAM_SERVERS @@ -491,7 +491,7 @@ def query_by_record(record: Record, update_gameport: bool = False) -> A2SInfo: return A2SInfo(record, None) -def short_ip_to_record(addr: str) -> Optional[Record]: +def short_ip_to_record(addr: str) -> Record | None: r = addr.split(":") # TODO: raise exceptions instead of Nonetype if len(r) != 2: @@ -499,7 +499,7 @@ def short_ip_to_record(addr: str) -> Optional[Record]: return Record(r[0], 0, int(r[1])) -def fqip_to_record(addr: str) -> Optional[Record]: +def fqip_to_record(addr: str) -> Record | None: r = addr.split(":") if len(r) != 3: return None diff --git a/dzgui/views/trees/tree_base.py b/dzgui/views/trees/tree_base.py index a8d134e..2d16df7 100644 --- a/dzgui/views/trees/tree_base.py +++ b/dzgui/views/trees/tree_base.py @@ -1,7 +1,7 @@ import gi import logging -from typing import Any, Optional, TYPE_CHECKING +from typing import Any, TYPE_CHECKING from dzgui.const.constants import APP_NAME, SEPARATOR from dzgui.util.keys import is_ctrl_mask, is_navkey @@ -19,7 +19,7 @@ if TYPE_CHECKING: class TreeView(CursorMixin, Gtk.TreeView): # type: ignore def __init__( - self, controller: "Controller", menu: Optional["ContextMenuGroup"] + self, controller: "Controller", menu: "ContextMenuGroup | None" ) -> None: super().__init__( enable_search=False, @@ -58,7 +58,7 @@ class TreeView(CursorMixin, Gtk.TreeView): # type: ignore return True return False - def get_current_iter(self) -> Optional[Gtk.TreeIter]: + def get_current_iter(self) -> Gtk.TreeIter | None: it = self.get_selection().get_selected()[1] return it