urwid 2.4.6__cp37-cp37m-win_amd64.whl → 2.5.1__cp37-cp37m-win_amd64.whl

urwid/__init__.py

@@ -185,6 +185,8 @@ from urwid.widget import (
     PopUpTarget,
     ProgressBar,
     RadioButton,
+    Scrollable,
+    ScrollBar,
     SelectableIcon,
     Sizing,
     SolidFill,

urwid/canvas.py

@@ -40,7 +40,7 @@ from urwid.util import (
 )
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import Hashable, Iterable, Sequence
 
     from .widget import Widget
 
@@ -294,7 +294,7 @@ class Canvas:
         cols: int | None = None,
         rows: int | None = None,
         attr=None,
-    ):
+    ) -> Iterable[list[tuple[object, object, bytes]]]:
         raise NotImplementedError()
 
     def cols(self):
@@ -489,10 +489,10 @@ class TextCanvas(Canvas):
         self,
         trim_left: int = 0,
         trim_top: int = 0,
-        cols: int = 0,
-        rows: int = 0,
-        attr_map=None,
-    ):
+        cols: int | None = 0,
+        rows: int | None = 0,
+        attr=None,
+    ) -> Iterable[tuple[object, object, bytes]]:
         """
         Return the canvas content as a list of rows where each row
         is a list of (attr, cs, text) tuples.
@@ -534,8 +534,8 @@ class TextCanvas(Canvas):
             i = 0
             row = []
             for (a, cs), run in attr_cs:
-                if attr_map and a in attr_map:
-                    a = attr_map[a]  # noqa: PLW2901
+                if attr and a in attr:
+                    a = attr[a]  # noqa: PLW2901
                 row.append((a, cs, text[i : i + run]))
                 i += run
             yield row
@@ -566,10 +566,10 @@ class BlankCanvas(Canvas):
         self,
         trim_left: int = 0,
         trim_top: int = 0,
-        cols: int = 0,
-        rows: int = 0,
+        cols: int | None = 0,
+        rows: int | None = 0,
         attr=None,
-    ):
+    ) -> Iterable[list[tuple[object, object, bytes]]]:
         """
         return (cols, rows) of spaces with default attributes.
         """
@@ -621,7 +621,7 @@ class SolidCanvas(Canvas):
         cols: int | None = None,
         rows: int | None = None,
         attr=None,
-    ):
+    ) -> Iterable[list[tuple[object, object, bytes]]]:
         if cols is None:
             cols = self.size[0]
         if rows is None:
@@ -668,7 +668,12 @@ class CompositeCanvas(Canvas):
         super().__init__()
 
         if canv is None:
-            self.shards: list[tuple[int, list[tuple[int, int, int, int, typing.Any, Canvas]]]] = []
+            self.shards: list[
+                tuple[
+                    int,
+                    list[tuple[int, int, int, int, dict[Hashable | None, Hashable] | None, Canvas]],
+                ]
+            ] = []
             self.children: list[tuple[int, int, Canvas, typing.Any]] = []
         else:
             if hasattr(canv, "shards"):
@@ -712,7 +717,14 @@ class CompositeCanvas(Canvas):
             raise TypeError(cols)
         return cols
 
-    def content(self):
+    def content(
+        self,
+        trim_left: int = 0,
+        trim_top: int = 0,
+        cols: int | None = None,
+        rows: int | None = None,
+        attr=None,
+    ) -> Iterable[list[tuple[object, object, bytes]]]:
         """
         Return the canvas content as a list of rows where each row
         is a list of (attr, cs, text) tuples.
@@ -889,14 +901,14 @@ class CompositeCanvas(Canvas):
 
         self.coords.update(other.translate_coords(left, top))
 
-    def fill_attr(self, a) -> None:
+    def fill_attr(self, a: Hashable) -> None:
+        """
+        Apply attribute a to all areas of this canvas with default attribute currently set to None,
+        leaving other attributes intact.
         """
-        Apply attribute a to all areas of this canvas with default
-        attribute currently set to None, leaving other attributes
-        intact."""
         self.fill_attr_apply({None: a})
 
-    def fill_attr_apply(self, mapping) -> None:
+    def fill_attr_apply(self, mapping: dict[Hashable | None, Hashable]) -> None:
         """
         Apply an attribute-mapping dictionary to the canvas.
 
@@ -1209,7 +1221,7 @@ def cview_trim_cols(cv, cols: int):
     return cv[:2] + (cols,) + cv[3:]
 
 
-def CanvasCombine(canvas_info):
+def CanvasCombine(canvas_info: Iterable[tuple[Canvas, typing.Any, bool]]) -> CompositeCanvas:
     """Stack canvases in l vertically and return resulting canvas.
 
     :param canvas_info: list of (canvas, position, focus) tuples:
@@ -1245,7 +1257,7 @@ def CanvasCombine(canvas_info):
     return combined_canvas
 
 
-def CanvasOverlay(top_c, bottom_c, left: int, top: int):
+def CanvasOverlay(top_c, bottom_c, left: int, top: int) -> CompositeCanvas:
     """
     Overlay canvas top_c onto bottom_c at position (left, top).
     """
@@ -1258,7 +1270,7 @@ def CanvasOverlay(top_c, bottom_c, left: int, top: int):
     return overlayed_canvas
 
 
-def CanvasJoin(canvas_info):
+def CanvasJoin(canvas_info: Iterable[tuple[Canvas, typing.Any, bool, int]]) -> CompositeCanvas:
     """
     Join canvases in l horizontally. Return result.
 

urwid/command_map.py

@@ -39,6 +39,8 @@ class Command(str, enum.Enum):
     MAX_RIGHT = "cursor max right"
     ACTIVATE = "activate"
     MENU = "menu"
+    SELECT_NEXT = "next selectable"
+    SELECT_PREVIOUS = "prev selectable"
 
 
 REDRAW_SCREEN = Command.REDRAW_SCREEN
@@ -84,10 +86,10 @@ class CommandMap(typing.Mapping[str, typing.Union[str, Command, None]]):
         return len(self._command)
 
     _command_defaults: typing.ClassVar[dict[str, str | Command]] = {
-        "tab": "next selectable",
-        "ctrl n": "next selectable",
-        "shift tab": "prev selectable",
-        "ctrl p": "prev selectable",
+        "tab": Command.SELECT_NEXT,
+        "ctrl n": Command.SELECT_NEXT,
+        "shift tab": Command.SELECT_PREVIOUS,
+        "ctrl p": Command.SELECT_PREVIOUS,
         "ctrl l": Command.REDRAW_SCREEN,
         "esc": Command.MENU,
         "up": Command.UP,

urwid/display/_posix_raw_display.py

@@ -28,6 +28,7 @@ import contextlib
 import fcntl
 import functools
 import os
+import selectors
 import signal
 import struct
 import sys
@@ -289,14 +290,24 @@ class Screen(_raw_display_base.Screen):
                 raise
         return codes
 
-    def _getch(self, timeout: int) -> int:
+    def _read_raw_input(self, timeout: int) -> bytearray:
         ready = self._wait_for_input_ready(timeout)
         if self.gpm_mev is not None and self.gpm_mev.stdout.fileno() in ready:
             self.gpm_event_pending = True
         fd = self._input_fileno()
-        if fd is not None and fd in ready:
-            return ord(os.read(fd, 1))
-        return -1
+        chars = bytearray()
+
+        if fd is None or fd not in ready:
+            return chars
+
+        with selectors.DefaultSelector() as selector:
+            selector.register(fd, selectors.EVENT_READ)
+            input_ready = selector.select(0)
+            while input_ready:
+                chars.extend(os.read(fd, 1024))
+                input_ready = selector.select(0)
+
+            return chars
 
     def _encode_gpm_event(self) -> list[int]:
         self.gpm_event_pending = False

urwid/display/_raw_display_base.py

@@ -28,6 +28,7 @@ import abc
 import contextlib
 import functools
 import os
+import platform
 import selectors
 import signal
 import socket
@@ -41,7 +42,7 @@ from .common import UNPRINTABLE_TRANS_TABLE, UPDATE_PALETTE_ENTRY, AttrSpec, Bas
 
 if typing.TYPE_CHECKING:
     import io
-    from collections.abc import Callable
+    from collections.abc import Callable, Iterable
     from types import FrameType
 
     from typing_extensions import Literal
@@ -49,6 +50,7 @@ if typing.TYPE_CHECKING:
     from urwid import Canvas, EventLoop
 
 IS_WINDOWS = sys.platform == "win32"
+IS_WSL = (sys.platform == "linux") and ("wsl" in platform.platform().lower())
 
 
 class Screen(BaseScreen, RealTerminal):
@@ -227,12 +229,10 @@ class Screen(BaseScreen, RealTerminal):
         self._term_output_file.flush()
 
     @typing.overload
-    def get_input(self, raw_keys: Literal[False]) -> list[str]:
-        ...
+    def get_input(self, raw_keys: Literal[False]) -> list[str]: ...
 
     @typing.overload
-    def get_input(self, raw_keys: Literal[True]) -> tuple[list[str], list[int]]:
-        ...
+    def get_input(self, raw_keys: Literal[True]) -> tuple[list[str], list[int]]: ...
 
     def get_input(self, raw_keys: bool = False) -> list[str] | tuple[list[str], list[int]]:
         """Return pending input as a list.
@@ -373,7 +373,7 @@ class Screen(BaseScreen, RealTerminal):
         return wrapper
 
     def _get_input_codes(self) -> list[int]:
-        return self._get_keyboard_codes()
+        return list(self._get_keyboard_codes())
 
     def get_available_raw_input(self) -> list[int]:
         """
@@ -406,8 +406,7 @@ class Screen(BaseScreen, RealTerminal):
         callback: None,
         codes: list[int],
         wait_for_more: bool = ...,
-    ) -> tuple[list[str], list[int]]:
-        ...
+    ) -> tuple[list[str], list[int]]: ...
 
     @typing.overload
     def parse_input(
@@ -416,8 +415,7 @@ class Screen(BaseScreen, RealTerminal):
         callback: None,
         codes: list[int],
         wait_for_more: bool = ...,
-    ) -> tuple[list[str], list[int]]:
-        ...
+    ) -> tuple[list[str], list[int]]: ...
 
     @typing.overload
     def parse_input(
@@ -426,8 +424,7 @@ class Screen(BaseScreen, RealTerminal):
         callback: Callable[[list[str], list[int]], typing.Any],
         codes: list[int],
         wait_for_more: bool = ...,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     def parse_input(
         self,
@@ -496,15 +493,6 @@ class Screen(BaseScreen, RealTerminal):
         # For get_input
         return decoded_codes, raw_codes
 
-    def _get_keyboard_codes(self) -> list[int]:
-        codes = []
-        while True:
-            code = self._getch_nodelay()
-            if code < 0:
-                break
-            codes.append(code)
-        return codes
-
     def _wait_for_input_ready(self, timeout: float | None) -> list[int]:
         logger = self.logger.getChild("wait_for_input_ready")
         fd_list = self.get_input_descriptors()
@@ -521,11 +509,10 @@ class Screen(BaseScreen, RealTerminal):
         return [event.fd for event, _ in ready]
 
     @abc.abstractmethod
-    def _getch(self, timeout: int) -> int:
-        ...
+    def _read_raw_input(self, timeout: int) -> Iterable[int]: ...
 
-    def _getch_nodelay(self) -> int:
-        return self._getch(0)
+    def _get_keyboard_codes(self) -> Iterable[int]:
+        return self._read_raw_input(0)
 
     def _setup_G1(self) -> None:
         """
@@ -609,10 +596,10 @@ class Screen(BaseScreen, RealTerminal):
             if isinstance(a, AttrSpec):
                 return self._attrspec_to_escape(a)
             # undefined attributes use default/default
-            # TODO: track and report these
+            self.logger.debug(f"Undefined attribute: {a!r}")
             return self._attrspec_to_escape(AttrSpec("default", "default"))
 
-        def using_standout_or_underline(a):
+        def using_standout_or_underline(a: AttrSpec | str) -> bool:
             a = self._pal_attrspec.get(a, a)
             return isinstance(a, AttrSpec) and (a.standout or a.underline)
 
@@ -655,14 +642,17 @@ class Screen(BaseScreen, RealTerminal):
             first = True
             lasta = lastcs = None
             for a, cs, run in row:
-                if not isinstance(run, bytes):  # canvases should render with bytes
+                if not isinstance(run, bytes):  # canvases render with bytes
                     raise TypeError(run)
+
                 if cs != "U":
                     run = run.translate(UNPRINTABLE_TRANS_TABLE)  # noqa: PLW2901
+
                 if first or lasta != a:
                     o.append(attr_to_escape(a))
                     lasta = a
-                if first or lastcs != cs:
+
+                if not (IS_WINDOWS or IS_WSL) and (first or lastcs != cs):
                     if cs not in {None, "0", "U"}:
                         raise ValueError(cs)
                     if lastcs == "U":
@@ -675,23 +665,33 @@ class Screen(BaseScreen, RealTerminal):
                     else:
                         o.append(escape.SO)
                     lastcs = cs
+
                 o.append(run)
                 first = False
+
             if ins:
                 (inserta, insertcs, inserttext) = ins
                 ias = attr_to_escape(inserta)
                 if insertcs not in {None, "0", "U"}:
                     raise ValueError(insertcs)
-                if cs is None:
-                    icss = escape.SI
-                elif cs == "U":
-                    icss = escape.IBMPC_ON
-                else:
-                    icss = escape.SO
-                o += ["\x08" * back, ias, icss, escape.INSERT_ON, inserttext, escape.INSERT_OFF]
 
-                if cs == "U":
+                o.extend(("\x08" * back, ias))
+
+                if not (IS_WINDOWS or IS_WSL):
+                    if cs is None:
+                        icss = escape.SI
+                    elif cs == "U":
+                        icss = escape.IBMPC_ON
+                    else:
+                        icss = escape.SO
+
+                    o.append(icss)
+
+                o += [escape.INSERT_ON, inserttext, escape.INSERT_OFF]
+
+                if not (IS_WINDOWS or IS_WSL) and cs == "U":
                     o.append(escape.IBMPC_OFF)
+
             if whitespace_at_end:
                 o.append(escape.ERASE_IN_LINE_RIGHT)
 

urwid/display/_win32_raw_display.py

@@ -27,6 +27,7 @@ from __future__ import annotations
 import contextlib
 import functools
 import logging
+import selectors
 import socket
 import sys
 import threading
@@ -177,13 +178,23 @@ class Screen(_raw_display_base.Screen):
 
     _input_thread: ReadInputThread | None = None
 
-    def _getch(self, timeout: int) -> int:
+    def _read_raw_input(self, timeout: int) -> bytearray:
         ready = self._wait_for_input_ready(timeout)
 
         fd = self._input_fileno()
-        if fd is not None and fd in ready:
-            return ord(self._term_input_file.recv(1))
-        return -1
+        chars = bytearray()
+
+        if fd is None or fd not in ready:
+            return chars
+
+        with selectors.DefaultSelector() as selector:
+            selector.register(fd, selectors.EVENT_READ)
+            input_ready = selector.select(0)
+            while input_ready:
+                chars.extend(self._term_input_file.recv(1024))
+                input_ready = selector.select(0)
+
+            return chars
 
     def get_cols_rows(self) -> tuple[int, int]:
         """Return the terminal dimensions (num columns, num rows)."""

urwid/display/curses.py

@@ -295,12 +295,10 @@ class Screen(BaseScreen, RealTerminal):
         self.resize_tenths = convert_to_tenths(resize_wait)
 
     @typing.overload
-    def get_input(self, raw_keys: Literal[False]) -> list[str]:
-        ...
+    def get_input(self, raw_keys: Literal[False]) -> list[str]: ...
 
     @typing.overload
-    def get_input(self, raw_keys: Literal[True]) -> tuple[list[str], list[int]]:
-        ...
+    def get_input(self, raw_keys: Literal[True]) -> tuple[list[str], list[int]]: ...
 
     def get_input(self, raw_keys: bool = False) -> list[str] | tuple[list[str], list[int]]:
         """Return pending input as a list.

urwid/display/html_fragment.py

@@ -135,12 +135,10 @@ class HtmlGenerator(BaseScreen):
         return self.sizes.pop(0)
 
     @typing.overload
-    def get_input(self, raw_keys: Literal[False]) -> list[str]:
-        ...
+    def get_input(self, raw_keys: Literal[False]) -> list[str]: ...
 
     @typing.overload
-    def get_input(self, raw_keys: Literal[True]) -> tuple[list[str], list[int]]:
-        ...
+    def get_input(self, raw_keys: Literal[True]) -> tuple[list[str], list[int]]: ...
 
     def get_input(self, raw_keys: bool = False) -> list[str] | tuple[list[str], list[int]]:
         """Return the next list of keypresses in HtmlGenerator.keys."""

urwid/display/web.py

@@ -418,12 +418,10 @@ class Screen(BaseScreen):
         return self.screen_size
 
     @typing.overload
-    def get_input(self, raw_keys: Literal[False]) -> list[str]:
-        ...
+    def get_input(self, raw_keys: Literal[False]) -> list[str]: ...
 
     @typing.overload
-    def get_input(self, raw_keys: Literal[True]) -> tuple[list[str], list[int]]:
-        ...
+    def get_input(self, raw_keys: Literal[True]) -> tuple[list[str], list[int]]: ...
 
     def get_input(self, raw_keys: bool = False) -> list[str] | tuple[list[str], list[int]]:
         """Return pending input as a list."""