console-window 2.1.0__tar.gz → 2.1.1__tar.gz

{console_window-2.1.0 → console_window-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: console-window
-Version: 2.1.0
+Version: 2.1.1
 Summary: A robust curses wrapper for creating Text User Interfaces (TUIs).
 Author-email: Joe Defen <joedef@duck.com>
 Requires-Python: >=3.10

{console_window-2.1.0 → console_window-2.1.1}/console_window/__init__.py

@@ -1,6 +1,6 @@
 # Single source of truth for the package version: pyproject.toml declares
 # ``dynamic = ["version"]``, so flit reads this value instead of duplicating it.
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 
 from .context import Context
 from .header import HeaderLine, Span

{console_window-2.1.0 → console_window-2.1.1}/console_window/screens.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections.abc import Iterable
 from types import SimpleNamespace
 from typing import TYPE_CHECKING, Protocol
 
@@ -15,6 +16,12 @@ class _AppLike(Protocol):
     win: ConsoleWindow
 
 
+#: One body row: plain text, or text paired with a curses attribute.
+_LineItem = str | tuple[str, int | None]
+#: One header entry, or a specification of one or more of them.
+_HeadSpec = str | HeaderLine | Iterable[str | HeaderLine] | None
+
+
 # Default home screen constant (applications should define their own)
 HOME_ST = 0
 
@@ -267,26 +274,28 @@ class BasicTextScreen(Screen):
 
     come_from_whitelist = None
 
-    def __init__(self, app: _AppLike, lines=(), head=()) -> None:
+    def __init__(self, app: _AppLike, lines: Iterable[_LineItem] = (),
+                 head: _HeadSpec = ()) -> None:
         super().__init__(app)
         self._lines: list[tuple[str, int | None]] = []
         self._heads: list[str | HeaderLine] = []
         self.set_text(lines, head)
 
-    def set_text(self, lines=(), head=()) -> None:
+    def set_text(self, lines: Iterable[_LineItem] = (),
+                 head: _HeadSpec = ()) -> None:
         """Replace the screen's content.  Safe before or after the first draw."""
         self._lines = [self._normalize_line(item) for item in (lines or ())]
         self._heads = self._normalize_heads(head)
 
     @staticmethod
-    def _normalize_line(item) -> tuple[str, int | None]:
+    def _normalize_line(item: _LineItem) -> tuple[str, int | None]:
         if isinstance(item, str):
             return item, None
         text, attr = item
         return str(text), attr
 
     @staticmethod
-    def _normalize_heads(head) -> list[str | HeaderLine]:
+    def _normalize_heads(head: _HeadSpec) -> list[str | HeaderLine]:
         if head is None:
             return []
         if isinstance(head, (str, HeaderLine)):

{console_window-2.1.0 → console_window-2.1.1}/console_window/widgets.py

@@ -349,7 +349,9 @@ class PromptLine:
 
     def start(self, prompt: str, *, hint: str = '', mode: str = 'y',
               identity: str | None = None, seed: str = '',
-              choices=None, on_confirm=None, on_cancel=None,
+              choices: str | list[str] | tuple[str, ...] | None = None,
+              on_confirm: Callable[[str], object] | None = None,
+              on_cancel: Callable[[], object] | None = None,
               min_abbrev_chars: int | None = None) -> None:
         self._editor.start(action_type=None, identity=identity, choices=choices,
                            mode=mode, min_abbrev_chars=min_abbrev_chars,

{console_window-2.1.0 → console_window-2.1.1}/console_window/window.py

@@ -1151,8 +1151,9 @@ class ConsoleWindow:
 
     def begin_prompt(self, prompt: str, *, hint: str = '', mode: str = 'y',
                      identity: str | None = None, seed: str = '',
-                     choices=None, on_confirm=None,
-                     on_cancel=None) -> bool:
+                     choices: str | list[str] | tuple[str, ...] | None = None,
+                     on_confirm: Callable[[str], object] | None = None,
+                     on_cancel: Callable[[], object] | None = None) -> bool:
         """Start an in-place prompt and enable passthrough key routing.
 
         The window *is* the receiver, so there is no window-existence branch
@@ -1188,6 +1189,7 @@ class ConsoleWindow:
         answer, on_confirm, on_cancel = self.prompt_line.take()
         self.end_prompt()                     # passthrough restored FIRST
         if result == 'confirmed' and on_confirm:
+            assert answer is not None
             on_confirm(answer)                # may begin_prompt() the next prompt
         elif result == 'cancelled' and on_cancel:
             on_cancel()