mirror of
https://github.com/rr-/pq-cli.git
synced 2026-11-12 22:40:36 -07:00
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:
34 files changed
+219
-153
No files matched your search
@@ -1,16 +1,16 @@
|
||||
import curses
|
||||
import functools
|
||||
from collections.abc import Sequence
|
||||
from typing import Any
|
||||
|
||||
from pqcli.config import Class
|
||||
from pqcli.ui.curses.util import KEYS_CANCEL, Choice
|
||||
from pqcli.ui.curses.views.menu_view import MenuView
|
||||
|
||||
|
||||
class ChooseCharacterClassView(MenuView):
|
||||
class ChooseCharacterClassView(MenuView[Class]):
|
||||
def __init__(
|
||||
self,
|
||||
screen: Any,
|
||||
screen: curses.window,
|
||||
classes: Sequence[Class],
|
||||
class_: Class | None = None,
|
||||
) -> None:
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import curses
|
||||
import curses.ascii
|
||||
from typing import Any
|
||||
|
||||
from pqcli.mechanic import generate_name
|
||||
from pqcli.ui.curses.event_handler import EventHandler
|
||||
@@ -10,15 +9,17 @@ from pqcli.ui.curses.widgets.focusable import focus_standout
|
||||
|
||||
|
||||
class ChooseCharacterNameView(BaseView):
|
||||
def __init__(self, screen: Any, character_name: str | None = None) -> None:
|
||||
def __init__(
|
||||
self, screen: curses.window, character_name: str | None = None
|
||||
) -> None:
|
||||
super().__init__(screen)
|
||||
|
||||
self.on_cancel = EventHandler()
|
||||
self.on_confirm = EventHandler()
|
||||
self.on_cancel = EventHandler[[]]()
|
||||
self.on_confirm = EventHandler[[str]]()
|
||||
|
||||
self._active_widget = 0
|
||||
self._win: Any | None = None
|
||||
self._text_win: Any | None = None
|
||||
self._win: curses.window | None = None
|
||||
self._text_win: curses.window | None = None
|
||||
self._text = character_name or generate_name()
|
||||
|
||||
def start(self) -> None:
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
import curses
|
||||
import functools
|
||||
from collections.abc import Sequence
|
||||
from typing import Any
|
||||
|
||||
from pqcli.config import Race
|
||||
from pqcli.ui.curses.util import KEYS_CANCEL, Choice
|
||||
from pqcli.ui.curses.views.menu_view import MenuView
|
||||
|
||||
|
||||
class ChooseCharacterRaceView(MenuView):
|
||||
class ChooseCharacterRaceView(MenuView[Race]):
|
||||
def __init__(
|
||||
self,
|
||||
screen: Any,
|
||||
screen: curses.window,
|
||||
races: Sequence[Race],
|
||||
race: Race | None = None,
|
||||
) -> None:
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import curses
|
||||
import curses.ascii
|
||||
from typing import Any
|
||||
|
||||
from pqcli.config import PRIME_STATS
|
||||
from pqcli.mechanic import StatsBuilder
|
||||
from pqcli.mechanic import Stats, StatsBuilder
|
||||
from pqcli.random import RngState
|
||||
from pqcli.ui.curses.event_handler import EventHandler
|
||||
from pqcli.ui.curses.util import KEYS_CANCEL, KEYS_CYCLE, KEYS_DOWN, KEYS_UP
|
||||
from pqcli.ui.curses.views.base_view import BaseView
|
||||
@@ -10,15 +11,15 @@ from pqcli.ui.curses.widgets.focusable import focus_standout
|
||||
|
||||
|
||||
class ChooseCharacterStatsView(BaseView):
|
||||
def __init__(self, screen: Any) -> None:
|
||||
def __init__(self, screen: curses.window) -> None:
|
||||
super().__init__(screen)
|
||||
|
||||
self.on_cancel = EventHandler()
|
||||
self.on_confirm = EventHandler()
|
||||
self.on_cancel = EventHandler[[]]()
|
||||
self.on_confirm = EventHandler[[Stats, RngState]]()
|
||||
|
||||
self._active_widget = 0
|
||||
self._win: Any | None = None
|
||||
self._stats_win: Any | None = None
|
||||
self._win: curses.window | None = None
|
||||
self._stats_win: curses.window | None = None
|
||||
|
||||
self._stats_builder = StatsBuilder()
|
||||
self._stats = self._stats_builder.roll()
|
||||
|
||||
Reference in new issue
Block a user