urwid 2.5.0__cp312-cp312-win32.whl → 2.5.1__cp312-cp312-win32.whl

urwid/canvas.py

@@ -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:
@@ -717,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.

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):
@@ -371,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]:
         """
@@ -491,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()
@@ -516,10 +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:
         """
@@ -603,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)
 
@@ -649,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":
@@ -669,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/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.5.0'
-__version_tuple__ = version_tuple = (2, 5, 0)
+__version__ = version = '2.5.1'
+__version_tuple__ = version_tuple = (2, 5, 1)

urwid/vterm.py

@@ -1437,11 +1437,11 @@ class TermCanvas(Canvas):
     def content(
         self,
         trim_left: int = 0,
-        trim_right: int = 0,
+        trim_top: int = 0,
         cols: int | None = None,
         rows: int | None = None,
         attr=None,
-    ):
+    ) -> Iterable[list[tuple[object, object, bytes]]]:
         if self.scrolling_up == 0:
             yield from self.term
         else:
@@ -1669,7 +1669,7 @@ class Terminal(Widget):
         elif hasattr(self, "old_tios"):
             RealTerminal().tty_signal_keys(*self.old_tios)
 
-    def render(self, size: tuple[int, int], focus: bool = False):
+    def render(self, size: tuple[int, int], focus: bool = False) -> TermCanvas:
         if not self.terminated:
             self.change_focus(focus)
 

urwid/widget/attr_map.py

@@ -5,22 +5,24 @@ from collections.abc import Hashable, Mapping
 
 from urwid.canvas import CompositeCanvas
 
-from .widget import Widget, WidgetError, delegate_to_widget_mixin
+from .widget import WidgetError, delegate_to_widget_mixin
 from .widget_decoration import WidgetDecoration
 
+WrappedWidget = typing.TypeVar("WrappedWidget")
+
 
 class AttrMapError(WidgetError):
     pass
 
 
-class AttrMap(delegate_to_widget_mixin("_original_widget"), WidgetDecoration):
+class AttrMap(delegate_to_widget_mixin("_original_widget"), WidgetDecoration[WrappedWidget]):
     """
     AttrMap is a decoration that maps one set of attributes to another.
     This object will pass all function calls and variable references to the
     wrapped widget.
     """
 
-    def __init__(self, w: Widget, attr_map, focus_map=None) -> None:
+    def __init__(self, w: WrappedWidget, attr_map, focus_map=None) -> None:
         """
         :param w: widget to wrap (stored as self.original_widget)
         :type w: widget

urwid/widget/bar_graph.py

@@ -52,7 +52,7 @@ class BarGraph(Widget, metaclass=BarGraphMeta):
     eighths = BAR_SYMBOLS.VERTICAL[:8]  # Full height is done by style
     hlines = "_⎺⎻─⎼⎽"
 
-    def __init__(self, attlist, hatt=None, satt=None):
+    def __init__(self, attlist, hatt=None, satt=None) -> None:
         """
         Create a bar graph with the passed display characteristics.
         see set_segment_attributes for a description of the parameters.
@@ -134,7 +134,7 @@ class BarGraph(Widget, metaclass=BarGraphMeta):
                 raise BarGraphError(f"fg ({fg}) not > bg ({bg})")
         self.satt = satt
 
-    def set_data(self, bardata, top, hlines=None):
+    def set_data(self, bardata, top: float, hlines=None) -> None:
         """
         Store bar data, bargraph top and horizontal line positions.
 
@@ -428,7 +428,7 @@ class BarGraph(Widget, metaclass=BarGraphMeta):
         return canv
 
 
-def calculate_bargraph_display(bardata, top, bar_widths, maxrow: int):
+def calculate_bargraph_display(bardata, top: float, bar_widths: list[int], maxrow: int):
     """
     Calculate a rendering of the bar graph described by data, bar_widths
     and height.
@@ -574,7 +574,7 @@ def calculate_bargraph_display(bardata, top, bar_widths, maxrow: int):
 class GraphVScale(Widget):
     _sizing = frozenset([Sizing.BOX])
 
-    def __init__(self, labels, top):
+    def __init__(self, labels, top: float) -> None:
         """
         GraphVScale( [(label1 position, label1 markup),...], top )
         label position -- 0 < position < top for the y position
@@ -587,7 +587,7 @@ class GraphVScale(Widget):
         super().__init__()
         self.set_scale(labels, top)
 
-    def set_scale(self, labels, top):
+    def set_scale(self, labels, top: float) -> None:
         """
         set_scale( [(label1 position, label1 markup),...], top )
         label position -- 0 < position < top for the y position
@@ -610,7 +610,7 @@ class GraphVScale(Widget):
         """
         return False
 
-    def render(self, size: tuple[int, int], focus: bool = False):
+    def render(self, size: tuple[int, int], focus: bool = False) -> SolidCanvas | CompositeCanvas:
         """
         Render GraphVScale.
         """
@@ -641,7 +641,7 @@ class GraphVScale(Widget):
         return c
 
 
-def scale_bar_values(bar, top, maxrow: int):
+def scale_bar_values(bar, top: float, maxrow: int) -> list[int]:
     """
     Return a list of bar values aliased to integer values of maxrow.
     """

urwid/widget/box_adapter.py

@@ -8,22 +8,21 @@ from urwid.canvas import CompositeCanvas
 from .constants import Sizing
 from .widget_decoration import WidgetDecoration, WidgetError
 
-if typing.TYPE_CHECKING:
-    from .widget import Widget
+WrappedWidget = typing.TypeVar("WrappedWidget")
 
 
 class BoxAdapterError(WidgetError):
     pass
 
 
-class BoxAdapter(WidgetDecoration):
+class BoxAdapter(WidgetDecoration[WrappedWidget]):
     """
     Adapter for using a box widget where a flow widget would usually go
     """
 
     no_cache: typing.ClassVar[list[str]] = ["rows"]
 
-    def __init__(self, box_widget, height):
+    def __init__(self, box_widget: WrappedWidget, height: int) -> None:
         """
         Create a flow widget that contains a box widget
 
@@ -47,7 +46,7 @@ class BoxAdapter(WidgetDecoration):
 
     # originally stored as box_widget, keep for compatibility
     @property
-    def box_widget(self) -> Widget:
+    def box_widget(self) -> WrappedWidget:
         warnings.warn(
             "original stored as original_widget, keep for compatibility",
             PendingDeprecationWarning,
@@ -56,7 +55,7 @@ class BoxAdapter(WidgetDecoration):
         return self.original_widget
 
     @box_widget.setter
-    def box_widget(self, widget: Widget):
+    def box_widget(self, widget: WrappedWidget) -> None:
         warnings.warn(
             "original stored as original_widget, keep for compatibility",
             PendingDeprecationWarning,
@@ -104,7 +103,7 @@ class BoxAdapter(WidgetDecoration):
     def mouse_event(
         self,
         size: tuple[int],
-        event,
+        event: str,
         button: int,
         col: int,
         row: int,

urwid/widget/columns.py

@@ -6,6 +6,7 @@ from itertools import chain, repeat
 
 import urwid
 from urwid.canvas import Canvas, CanvasJoin, CompositeCanvas, SolidCanvas
+from urwid.command_map import Command
 from urwid.monitored_list import MonitoredFocusList, MonitoredList
 from urwid.util import is_mouse_press
 
@@ -795,13 +796,16 @@ class Columns(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
                 else:
                     w_h_args[i] = (0,)
 
-            elif Sizing.FIXED in w_sizing and (Sizing.FLOW in w_sizing or is_box):
-                width, height = widget.pack((), focused)
+            elif Sizing.FLOW in w_sizing or is_box:
+                if Sizing.FIXED in w_sizing:
+                    width, height = widget.pack((), focused)
+                else:
+                    width = self.min_width
+
                 weighted.setdefault(size_weight, []).append((widget, i, is_box, focused))
                 weights.append(size_weight)
                 weight_max_sizes.setdefault(size_weight, width)
                 weight_max_sizes[size_weight] = max(weight_max_sizes[size_weight], width)
-
             else:
                 raise ColumnsError(f"Unsupported combination of {size_kind} box={is_box!r} for {widget}")
 
@@ -819,6 +823,9 @@ class Columns(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
                     else:
                         box.append(i)
 
+        if not heights:
+            raise ColumnsError(f"No height information for pack {self!r} as FIXED")
+
         max_height = max(heights.values())
         for idx in box:
             heights[idx] = max_height
@@ -1019,7 +1026,7 @@ class Columns(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
     def mouse_event(
         self,
         size: tuple[()] | tuple[int] | tuple[int, int],
-        event,
+        event: str,
         button: int,
         col: int,
         row: int,
@@ -1115,15 +1122,15 @@ class Columns(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
 
         i = self.focus_position
         w, _ = self.contents[i]
-        if self._command_map[key] not in {"cursor up", "cursor down", "cursor page up", "cursor page down"}:
+        if self._command_map[key] not in {Command.UP, Command.DOWN, Command.PAGE_UP, Command.PAGE_DOWN}:
             self.pref_col = None
         if w.selectable():
             key = w.keypress(size_args[i], key)
 
-        if self._command_map[key] not in {"cursor left", "cursor right"}:
+        if self._command_map[key] not in {Command.LEFT, Command.RIGHT}:
             return key
 
-        if self._command_map[key] == "cursor left":
+        if self._command_map[key] == Command.LEFT:
             candidates = list(range(i - 1, -1, -1))  # count backwards to 0
         else:  # key == 'right'
             candidates = list(range(i + 1, len(self.contents)))

urwid/widget/divider.py

@@ -69,7 +69,7 @@ class Divider(Widget):
         self.top = top
         self.bottom = bottom
 
-    def _repr_words(self):
+    def _repr_words(self) -> list[str]:
         return super()._repr_words() + [repr(self.div_char)] * (self.div_char != " ")
 
     def _repr_attrs(self) -> dict[str, typing.Any]:
@@ -92,7 +92,7 @@ class Divider(Widget):
         (_maxcol,) = size
         return self.top + 1 + self.bottom
 
-    def render(self, size: tuple[int], focus: bool = False):
+    def render(self, size: tuple[int], focus: bool = False) -> CompositeCanvas:
         """
         Render the divider as a canvas and return it.
 

urwid/widget/edit.py

@@ -550,7 +550,7 @@ class Edit(Text):
         self._invalidate()
         return True
 
-    def mouse_event(self, size: tuple[int], event, button: int, x: int, y: int, focus: bool) -> bool | None:
+    def mouse_event(self, size: tuple[int], event: str, button: int, x: int, y: int, focus: bool) -> bool | None:
         """
         Move the cursor to the location clicked for button 1.
 

urwid/widget/filler.py

@@ -22,17 +22,18 @@ from .widget_decoration import WidgetDecoration, WidgetError
 if typing.TYPE_CHECKING:
     from typing_extensions import Literal
 
-    from .widget import Widget
+
+WrappedWidget = typing.TypeVar("WrappedWidget")
 
 
 class FillerError(WidgetError):
     pass
 
 
-class Filler(WidgetDecoration):
+class Filler(WidgetDecoration[WrappedWidget]):
     def __init__(
         self,
-        body: Widget,
+        body: WrappedWidget,
         valign: (
             Literal["top", "middle", "bottom"] | VAlign | tuple[Literal["relative", WHSettings.RELATIVE], int]
         ) = VAlign.MIDDLE,
@@ -159,7 +160,7 @@ class Filler(WidgetDecoration):
         return remove_defaults(attrs, Filler.__init__)
 
     @property
-    def body(self):
+    def body(self) -> WrappedWidget:
         """backwards compatibility, widget used to be stored as body"""
         warnings.warn(
             "backwards compatibility, widget used to be stored as body",
@@ -169,7 +170,7 @@ class Filler(WidgetDecoration):
         return self.original_widget
 
     @body.setter
-    def body(self, new_body):
+    def body(self, new_body: WrappedWidget) -> None:
         warnings.warn(
             "backwards compatibility, widget used to be stored as body",
             PendingDeprecationWarning,
@@ -177,7 +178,7 @@ class Filler(WidgetDecoration):
         )
         self.original_widget = new_body
 
-    def get_body(self):
+    def get_body(self) -> WrappedWidget:
         """backwards compatibility, widget used to be stored as body"""
         warnings.warn(
             "backwards compatibility, widget used to be stored as body",
@@ -186,7 +187,7 @@ class Filler(WidgetDecoration):
         )
         return self.original_widget
 
-    def set_body(self, new_body):
+    def set_body(self, new_body: WrappedWidget) -> None:
         warnings.warn(
             "backwards compatibility, widget used to be stored as body",
             DeprecationWarning,

urwid/widget/frame.py

@@ -448,7 +448,15 @@ class Frame(Widget, WidgetContainerMixin):
             return key
         return self.body.keypress((maxcol, remaining), key)
 
-    def mouse_event(self, size: tuple[int, int], event, button: int, col: int, row: int, focus: bool) -> bool | None:
+    def mouse_event(
+        self,
+        size: tuple[int, int],
+        event: str,
+        button: int,
+        col: int,
+        row: int,
+        focus: bool,
+    ) -> bool | None:
         """
         Pass mouse event to appropriate part of frame.
         Focus may be changed on button 1 press.