misc: replace Any with precise types

Curses screens, windows and pads are typed as curses.window, and the
widgets that may get no parent window take curses.window | None.

- EventHandler is generic over a ParamSpec, so each handler declares
  the arguments it passes, and MenuView is generic over the item its
  on_confirm hands out. Choice callbacks take no arguments.
- Scrollable is generic over its items, which DataTable and ListBox
  fix to tuple[str, str] and str.
- random.choice() and choice_low() are generic over the sequence, so
  the casts at their call sites are gone. BasicUserInterface.menu()
  and util.first() are generic too.
- Signal callbacks and their payloads are Callable[..., object] and
  object, since emit() only forwards them.
- JSON values in game_data are object and narrowed by isinstance,
  and data files are Traversable.
- Signal handlers take an int and a FrameType | None, and
  list_players() takes a TextIO.
- The focus_standout() context managers return
  Generator[None, None, None].

Any remains in three places: Player.__setstate__, whose pickled
__dict__ holds values of every type; Focusable.__init__, a mixin that
passes *args and **kwargs through to the next class; and the values
load_game_data() collects, whose element type depends on the field
each one fills.
This commit is contained in:
Dash committed 2026-10-17 15:55:59 +02:00
1 parent 00794aca37
commit fd4a7d151d
34 files changed
+219 -153

No files matched your search

+2 -3
View File
@@ -1,5 +1,4 @@
import curses
from typing import Any
class Widget:
@@ -12,10 +11,10 @@ class Widget:
class WindowWrapper(Widget):
def __init__(
self, parent: Any | None, h: int, w: int, y: int, x: int
self, parent: curses.window | None, h: int, w: int, y: int, x: int
) -> None:
self._parent = parent
self._win: Any | None
self._win: curses.window | None
if not parent:
self._win = None
+2 -4
View File
@@ -1,15 +1,14 @@
import curses
from typing import Any
from pqcli.ui.curses.colors import COLOR_HIGHLIGHT, has_colors
from .scrollable import Scrollable
class DataTable(Scrollable):
class DataTable(Scrollable[tuple[str, str]]):
def __init__(
self,
parent: Any,
parent: curses.window | None,
h: int,
w: int,
y: int,
@@ -19,7 +18,6 @@ class DataTable(Scrollable):
super().__init__(parent, h, w, y, x)
self._align_right = align_right
self._items: list[tuple[str, str]]
self._selected: int | None = None
def add(self, text: str, value: str) -> None:
+7 -3
View File
@@ -8,7 +8,9 @@ from pqcli.ui.curses.event_handler import EventHandler
@contextlib.contextmanager
def focus_standout(focused: bool, win: Any) -> Generator:
def focus_standout(
focused: bool, win: curses.window
) -> Generator[None, None, None]:
if focused:
if has_colors():
win.attron(curses.color_pair(COLOR_FOCUSED))
@@ -25,7 +27,7 @@ def focus_standout(focused: bool, win: Any) -> Generator:
class Focusable:
def __init__(self, *args: Any, **kwargs: Any) -> None:
self._focused = False
self._on_focus_change = EventHandler()
self._on_focus_change = EventHandler[[]]()
super().__init__(*args, **kwargs)
@property
@@ -38,6 +40,8 @@ class Focusable:
self._on_focus_change()
@contextlib.contextmanager
def focus_standout(self, win: Any) -> Generator:
def focus_standout(
self, win: curses.window
) -> Generator[None, None, None]:
with focus_standout(self._focused, win):
yield
+4 -5
View File
@@ -1,15 +1,14 @@
import curses
from typing import Any
from pqcli.ui.curses.colors import COLOR_HIGHLIGHT, has_colors
from .scrollable import Scrollable
class ListBox(Scrollable):
_items: list[str]
def __init__(self, parent: Any, h: int, w: int, y: int, x: int) -> None:
class ListBox(Scrollable[str]):
def __init__(
self, parent: curses.window | None, h: int, w: int, y: int, x: int
) -> None:
super().__init__(parent, h, w, y, x)
self._selected: int | None = None
+1 -2
View File
@@ -1,6 +1,5 @@
import curses
import curses.ascii
from typing import Any
from pqcli.ui.curses.util import KEYS_CYCLE, KEYS_DOWN, KEYS_UP, Choice
from pqcli.ui.curses.widgets.focusable import focus_standout
@@ -29,7 +28,7 @@ class Menu(Widget):
w = max(map(len, all_lines)) + 1
h = len(all_lines) + 1
pad = curses.newpad(h, w)
self._pad: Any | None = pad
self._pad: curses.window | None = pad
for y, line in enumerate(self._header_lines):
pad.move(y, 0)
+7 -2
View File
@@ -1,6 +1,5 @@
import curses
import datetime
from typing import Any
from pqcli.lingo import format_timespan
from pqcli.ui.curses.colors import COLOR_PROGRESSBAR, has_colors
@@ -9,7 +8,13 @@ from pqcli.ui.curses.widgets.base import WindowWrapper
class ProgressBar(WindowWrapper):
def __init__(
self, parent: Any, h: int, w: int, y: int, x: int, show_time: bool
self,
parent: curses.window | None,
h: int,
w: int,
y: int,
x: int,
show_time: bool,
) -> None:
super().__init__(parent, h, w, y, x)
+9 -5
View File
@@ -1,5 +1,5 @@
import curses
from typing import Any
from typing import Generic, TypeVar
from pqcli.ui.curses.colors import (
COLOR_SCROLLBAR_THUMB,
@@ -9,13 +9,17 @@ from pqcli.ui.curses.colors import (
from .base import WindowWrapper
ItemT = TypeVar("ItemT")
class Scrollable(WindowWrapper):
def __init__(self, parent: Any, h: int, w: int, y: int, x: int) -> None:
class Scrollable(WindowWrapper, Generic[ItemT]):
def __init__(
self, parent: curses.window | None, h: int, w: int, y: int, x: int
) -> None:
super().__init__(parent, h, w, y, x)
self._scroll_pos = 0
self._pad: Any | None = curses.newpad(1, 1)
self._items: list[Any] = []
self._pad: curses.window | None = curses.newpad(1, 1)
self._items: list[ItemT] = []
def clear(self) -> None:
self._items = []