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

+3 -3
View File
@@ -2,7 +2,7 @@ import argparse
import curses
import curses.ascii
import datetime
from typing import Any, Protocol, runtime_checkable
from typing import Protocol, runtime_checkable
from pqcli.game_data import GameData
from pqcli.mechanic import Player, SignalMixin, Simulation
@@ -44,14 +44,14 @@ class PageScrollable(Protocol):
class GameView(BaseView):
def __init__(
self,
screen: Any,
screen: curses.window,
roster: Roster,
player: Player,
args: argparse.Namespace,
data: GameData,
) -> None:
super().__init__(screen)
self.on_exit = EventHandler()
self.on_exit = EventHandler[[]]()
self._roster = roster
self._player = player
@@ -1,4 +1,4 @@
from typing import Any
import curses
from pqcli.mechanic import Player, StatType
@@ -7,7 +7,13 @@ from .progress_bar_window import DataTableProgressBarWindow
class CharacterSheetWindow(DataTableProgressBarWindow):
def __init__(
self, player: Player, parent: Any, h: int, w: int, y: int, x: int
self,
player: Player,
parent: curses.window,
h: int,
w: int,
y: int,
x: int,
) -> None:
super().__init__(
parent,
@@ -1,4 +1,4 @@
from typing import Any
import curses
from pqcli.mechanic import EquipmentType, Player
from pqcli.ui.curses.widgets import DataTable, Focusable, WindowWrapper
@@ -6,7 +6,13 @@ from pqcli.ui.curses.widgets import DataTable, Focusable, WindowWrapper
class EquipmentWindow(Focusable, WindowWrapper):
def __init__(
self, player: Player, parent: Any, h: int, w: int, y: int, x: int
self,
player: Player,
parent: curses.window,
h: int,
w: int,
y: int,
x: int,
) -> None:
super().__init__(parent, h, w, y, x)
self._on_focus_change += self._render
@@ -1,4 +1,4 @@
from typing import Any
import curses
from pqcli.mechanic import InventoryItem, Player
@@ -7,7 +7,13 @@ from .progress_bar_window import DataTableProgressBarWindow
class InventoryWindow(DataTableProgressBarWindow):
def __init__(
self, player: Player, parent: Any, h: int, w: int, y: int, x: int
self,
player: Player,
parent: curses.window,
h: int,
w: int,
y: int,
x: int,
) -> None:
super().__init__(
parent,
@@ -1,4 +1,4 @@
from typing import Any
import curses
from pqcli.lingo import act_name
from pqcli.mechanic import Player
@@ -10,7 +10,13 @@ class PlotWindow(ListBoxProgressBarWindow):
cutoff = 100
def __init__(
self, player: Player, parent: Any, h: int, w: int, y: int, x: int
self,
player: Player,
parent: curses.window,
h: int,
w: int,
y: int,
x: int,
) -> None:
super().__init__(
parent, h, w, y, x, " Plot Development ", show_time=True
@@ -1,5 +1,4 @@
import curses
from typing import Any
from pqcli.ui.curses.widgets import (
DataTable,
@@ -13,7 +12,7 @@ from pqcli.ui.curses.widgets import (
class ProgressBarWindow(Focusable, WindowWrapper):
def __init__(
self,
parent: Any,
parent: curses.window,
h: int,
w: int,
y: int,
@@ -82,7 +81,7 @@ class ProgressBarWindow(Focusable, WindowWrapper):
class DataTableProgressBarWindow(ProgressBarWindow):
def __init__(
self,
parent: Any,
parent: curses.window,
h: int,
w: int,
y: int,
@@ -123,7 +122,7 @@ class DataTableProgressBarWindow(ProgressBarWindow):
class ListBoxProgressBarWindow(ProgressBarWindow):
def __init__(
self,
parent: Any,
parent: curses.window,
h: int,
w: int,
y: int,
@@ -1,4 +1,4 @@
from typing import Any
import curses
from pqcli.mechanic import Player
@@ -9,7 +9,13 @@ class QuestBookWindow(ListBoxProgressBarWindow):
cutoff = 100
def __init__(
self, player: Player, parent: Any, h: int, w: int, y: int, x: int
self,
player: Player,
parent: curses.window,
h: int,
w: int,
y: int,
x: int,
) -> None:
super().__init__(parent, h, w, y, x, " Quests ", show_time=True)
self._on_focus_change += self._render
@@ -1,4 +1,4 @@
from typing import Any
import curses
from pqcli.lingo import to_roman
from pqcli.mechanic import Player, Spell
@@ -7,7 +7,13 @@ from pqcli.ui.curses.widgets import DataTable, Focusable, WindowWrapper
class SpellBookWindow(Focusable, WindowWrapper):
def __init__(
self, player: Player, parent: Any, h: int, w: int, y: int, x: int
self,
player: Player,
parent: curses.window,
h: int,
w: int,
y: int,
x: int,
) -> None:
super().__init__(parent, h, w, y, x)
self._on_focus_change += self._render
@@ -1,4 +1,4 @@
from typing import Any
import curses
from pqcli.mechanic import Player
from pqcli.ui.curses.widgets import (
@@ -11,7 +11,13 @@ from pqcli.ui.curses.widgets import (
class TaskProgressWindow(Focusable, WindowWrapper):
def __init__(
self, player: Player, parent: Any, h: int, w: int, y: int, x: int
self,
player: Player,
parent: curses.window,
h: int,
w: int,
y: int,
x: int,
) -> None:
super().__init__(parent, h, w, y, x)