urwid 2.6.4__py3-none-any.whl → 2.6.6__py3-none-any.whl

urwid/__init__.py

@@ -53,32 +53,6 @@ from urwid.command_map import (
     CommandMap,
     command_map,
 )
-from urwid.display import (
-    BLACK,
-    BROWN,
-    DARK_BLUE,
-    DARK_CYAN,
-    DARK_GRAY,
-    DARK_GREEN,
-    DARK_MAGENTA,
-    DARK_RED,
-    DEFAULT,
-    LIGHT_BLUE,
-    LIGHT_CYAN,
-    LIGHT_GRAY,
-    LIGHT_GREEN,
-    LIGHT_MAGENTA,
-    LIGHT_RED,
-    UPDATE_PALETTE_ENTRY,
-    WHITE,
-    YELLOW,
-    AttrSpec,
-    AttrSpecError,
-    BaseScreen,
-    RealTerminal,
-    ScreenError,
-)
-from urwid.event_loop import AsyncioEventLoop, EventLoop, ExitMainLoop, MainLoop, SelectEventLoop
 from urwid.font import (
     Font,
     FontRegistry,
@@ -93,8 +67,6 @@ from urwid.font import (
     Thin6x6Font,
     get_all_fonts,
 )
-from urwid.listbox import ListBox, ListBoxError, ListWalker, ListWalkerError, SimpleFocusListWalker, SimpleListWalker
-from urwid.monitored_list import MonitoredFocusList, MonitoredList
 from urwid.signals import (
     MetaSignals,
     Signals,
@@ -121,7 +93,35 @@ from urwid.util import (
 )
 from urwid.version import version as __version__
 from urwid.version import version_tuple as __version_tuple__
-from urwid.widget import (
+
+from . import display, event_loop, widget
+from .display import (
+    BLACK,
+    BROWN,
+    DARK_BLUE,
+    DARK_CYAN,
+    DARK_GRAY,
+    DARK_GREEN,
+    DARK_MAGENTA,
+    DARK_RED,
+    DEFAULT,
+    LIGHT_BLUE,
+    LIGHT_CYAN,
+    LIGHT_GRAY,
+    LIGHT_GREEN,
+    LIGHT_MAGENTA,
+    LIGHT_RED,
+    UPDATE_PALETTE_ENTRY,
+    WHITE,
+    YELLOW,
+    AttrSpec,
+    AttrSpecError,
+    BaseScreen,
+    RealTerminal,
+    ScreenError,
+)
+from .event_loop import AsyncioEventLoop, EventLoop, ExitMainLoop, MainLoop, SelectEventLoop
+from .widget import (
     ANY,
     BOTTOM,
     BOX,
@@ -170,10 +170,17 @@ from urwid.widget import (
     GridFlowError,
     IntEdit,
     LineBox,
+    ListBox,
+    ListBoxError,
+    ListWalker,
+    ListWalkerError,
+    MonitoredFocusList,
+    MonitoredList,
     Overlay,
     OverlayError,
     Padding,
     PaddingError,
+    ParentNode,
     Pile,
     PileError,
     PopUpLauncher,
@@ -183,10 +190,17 @@ from urwid.widget import (
     Scrollable,
     ScrollBar,
     SelectableIcon,
+    SimpleFocusListWalker,
+    SimpleListWalker,
     Sizing,
     SolidFill,
     Text,
     TextError,
+    TreeListBox,
+    TreeNode,
+    TreeWalker,
+    TreeWidget,
+    TreeWidgetError,
     VAlign,
     WHSettings,
     Widget,
@@ -204,10 +218,6 @@ from urwid.widget import (
     scale_bar_values,
 )
 
-from . import display, event_loop, widget
-
-from .treetools import ParentNode, TreeListBox, TreeNode, TreeWalker, TreeWidget, TreeWidgetError  # isort: skip
-
 # Optional event loops with external dependencies
 
 try:
@@ -252,6 +262,9 @@ _moved_warn: dict[str, str] = {
     "lcd_display": "urwid.display.lcd",
     "html_fragment": "urwid.display.html_fragment",
     "web_display": "urwid.display.web",
+    "monitored_list": "urwid.widget.monitored_list",
+    "listbox": "urwid.widget.listbox",
+    "treetools": "urwid.widget.treetools",
 }
 # Backward compatible lazy load without any warnings
 # Before DeprecationWarning need to start PendingDeprecationWarning process.

urwid/canvas.py

@@ -216,7 +216,7 @@ class Canvas:
     def __init__(self) -> None:
         """Base Canvas class"""
         self._widget_info = None
-        self.coords: dict[str, tuple[int, int, tuple[Widget, int, int]]] = {}
+        self.coords: dict[str, tuple[int, int, tuple[Widget, int, int]] | tuple[int, int, None]] = {}
         self.shortcuts: dict[str, str] = {}
 
     def finalize(
@@ -580,7 +580,7 @@ class SolidCanvas(Canvas):
     A canvas filled completely with a single character.
     """
 
-    def __init__(self, fill_char: str, cols: int, rows: int) -> None:
+    def __init__(self, fill_char: str | bytes, cols: int, rows: int) -> None:
         super().__init__()
         end, col = calc_text_pos(fill_char, 0, len(fill_char), 1)
         if col != 1:
@@ -726,8 +726,7 @@ class CompositeCanvas(Canvas):
         Return the differences between other and this canvas.
         """
         if not hasattr(other, "shards"):
-            for row in self.content():
-                yield row
+            yield from self.content()
             return
 
         shard_tail = []
@@ -1275,8 +1274,7 @@ def CanvasJoin(canvas_info: Iterable[tuple[Canvas, typing.Any, bool, int]]) -> C
         pad_right = cols - canv.cols()
         if focus:
             focus_item = n
-        if rows > maxrow:
-            maxrow = rows
+        maxrow = max(maxrow, rows)
         l2.append((canv, pos, pad_right, rows))
 
     shard_lists = []

urwid/display/_posix_raw_display.py

@@ -43,7 +43,6 @@ from . import _raw_display_base, escape
 from .common import INPUT_DESCRIPTORS_CHANGED
 
 if typing.TYPE_CHECKING:
-    import io
     import socket
     from collections.abc import Callable
     from types import FrameType
@@ -54,8 +53,8 @@ if typing.TYPE_CHECKING:
 class Screen(_raw_display_base.Screen):
     def __init__(
         self,
-        input: io.TextIOBase = sys.stdin,  # noqa: A002  # pylint: disable=redefined-builtin
-        output: io.TextIOBase = sys.stdout,
+        input: typing.TextIO = sys.stdin,  # noqa: A002  # pylint: disable=redefined-builtin
+        output: typing.TextIO = sys.stdout,
         bracketed_paste_mode=False,
     ) -> None:
         """Initialize a screen that directly prints escape codes to an output
@@ -223,7 +222,7 @@ class Screen(_raw_display_base.Screen):
 
         super()._stop()
 
-    def get_input_descriptors(self) -> list[socket.socket | io.IOBase | typing.IO | int]:
+    def get_input_descriptors(self) -> list[socket.socket | typing.IO | int]:
         """
         Return a list of integer file descriptors that should be
         polled in external event loops to check for user input.

urwid/display/_raw_display_base.py

@@ -41,7 +41,6 @@ from . import escape
 from .common import UNPRINTABLE_TRANS_TABLE, UPDATE_PALETTE_ENTRY, AttrSpec, BaseScreen, RealTerminal
 
 if typing.TYPE_CHECKING:
-    import io
     from collections.abc import Callable, Iterable
     from types import FrameType
 
@@ -54,7 +53,7 @@ IS_WSL = (sys.platform == "linux") and ("wsl" in platform.platform().lower())
 
 
 class Screen(BaseScreen, RealTerminal):
-    def __init__(self, input: io.IOBase, output: io.IOBase):  # noqa: A002  # pylint: disable=redefined-builtin
+    def __init__(self, input: typing.IO, output: typing.IO) -> None:  # noqa: A002  # pylint: disable=redefined-builtin
         """Initialize a screen that directly prints escape codes to an output
         terminal.
         """
@@ -116,7 +115,7 @@ class Screen(BaseScreen, RealTerminal):
         self.screen_buf = None
 
     @property
-    def _term_input_io(self) -> io.IOBase | None:
+    def _term_input_io(self) -> typing.IO | None:
         if hasattr(self._term_input_file, "fileno"):
             return self._term_input_file
         return None
@@ -310,7 +309,7 @@ class Screen(BaseScreen, RealTerminal):
             return keys, raw
         return keys
 
-    def get_input_descriptors(self) -> list[socket.socket | io.IOBase | typing.IO | int]:
+    def get_input_descriptors(self) -> list[socket.socket | typing.IO | int]:
         """
         Return a list of integer file descriptors that should be
         polled in external event loops to check for user input.
@@ -323,7 +322,7 @@ class Screen(BaseScreen, RealTerminal):
         if not self._started:
             return []
 
-        fd_list = [self._resize_pipe_rd]
+        fd_list: list[socket.socket | typing.IO | int] = [self._resize_pipe_rd]
         input_io = self._term_input_io
         if input_io is not None:
             fd_list.append(input_io)

urwid/display/_win32_raw_display.py

@@ -41,7 +41,6 @@ from . import _raw_display_base, _win32, escape
 from .common import INPUT_DESCRIPTORS_CHANGED
 
 if typing.TYPE_CHECKING:
-    import io
     from collections.abc import Callable
 
     from urwid.event_loop import EventLoop
@@ -53,7 +52,7 @@ class Screen(_raw_display_base.Screen):
     def __init__(
         self,
         input: socket.socket | None = None,  # noqa: A002  # pylint: disable=redefined-builtin
-        output: io.TextIOBase = sys.stdout,
+        output: typing.TextIO = sys.stdout,
     ) -> None:
         """Initialize a screen that directly prints escape codes to an output
         terminal.

urwid/display/curses.py

@@ -103,7 +103,7 @@ _curses_colours = {  # pylint: disable=consider-using-namedtuple-or-dataclass  #
 
 
 class Screen(BaseScreen, RealTerminal):
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self.curses_pairs = [(None, None)]  # Can't be sure what pair 0 will default to
         self.palette = {}

urwid/display/html_fragment.py

@@ -53,7 +53,7 @@ class HtmlGenerator(BaseScreen):
     # class variables
     fragments: typing.ClassVar[list[str]] = []
     sizes: typing.ClassVar[list[tuple[int, int]]] = []
-    keys: typing.ClassVar[list[list[str] | tuple[list[str], list[int]]]] = []
+    keys: typing.ClassVar[list[list[str]]] = []
     started = True
 
     def __init__(self) -> None:

urwid/event_loop/__init__.py

@@ -20,28 +20,28 @@ __all__ = (
 try:
     from .twisted_loop import TwistedEventLoop
 
-    __all__ += ("TwistedEventLoop",)
+    __all__ += ("TwistedEventLoop",)  # type: ignore[assignment]
 except ImportError:
     pass
 
 try:
     from .tornado_loop import TornadoEventLoop
 
-    __all__ += ("TornadoEventLoop",)
+    __all__ += ("TornadoEventLoop",)  # type: ignore[assignment]
 except ImportError:
     pass
 
 try:
     from .glib_loop import GLibEventLoop
 
-    __all__ += ("GLibEventLoop",)
+    __all__ += ("GLibEventLoop",)  # type: ignore[assignment]
 except ImportError:
     pass
 
 try:
     from .trio_loop import TrioEventLoop
 
-    __all__ += ("TrioEventLoop",)
+    __all__ += ("TrioEventLoop",)  # type: ignore[assignment]
 except ImportError:
     pass
 
@@ -50,6 +50,6 @@ if sys.platform != "win32":
     try:
         from .zmq_loop import ZMQEventLoop
 
-        __all__ += ("ZMQEventLoop",)
+        __all__ += ("ZMQEventLoop",)  # type: ignore[assignment]
     except ImportError:
         pass

urwid/event_loop/main_loop.py

@@ -562,36 +562,41 @@ class MainLoop:
 
         something_handled = False
 
-        for k in keys:
-            if k == "window resize":
+        for key in keys:
+            if key == "window resize":
                 continue
 
-            if isinstance(k, str):
+            if isinstance(key, str):
                 if self._topmost_widget.selectable():
-                    k = self._topmost_widget.keypress(self.screen_size, k)  # noqa: PLW2901
-
-            elif isinstance(k, tuple):
-                if is_mouse_event(k):
-                    event, button, col, row = k
-                    if hasattr(self._topmost_widget, "mouse_event") and self._topmost_widget.mouse_event(
-                        self.screen_size,
-                        event,
-                        button,
-                        col,
-                        row,
-                        focus=True,
-                    ):
-                        k = None  # noqa: PLW2901
+                    handled_key = self._topmost_widget.keypress(self.screen_size, key)
+                    if not handled_key:
+                        something_handled = True
+                        continue
+
+                    key = handled_key  # noqa: PLW2901
+
+            elif is_mouse_event(key):
+                event, button, col, row = key
+                if hasattr(self._topmost_widget, "mouse_event") and self._topmost_widget.mouse_event(
+                    self.screen_size,
+                    event,
+                    button,
+                    col,
+                    row,
+                    focus=True,
+                ):
+                    something_handled = True
+                    continue
 
             else:
-                raise TypeError(f"{k!r} is not str | tuple[str, int, int, int]")
+                raise TypeError(f"{key!r} is not str | tuple[str, int, int, int]")
 
-            if k:
-                if command_map[k] == Command.REDRAW_SCREEN:
+            if key:
+                if command_map[key] == Command.REDRAW_SCREEN:
                     self.screen.clear()
                     something_handled = True
                 else:
-                    something_handled |= bool(self.unhandled_input(k))
+                    something_handled |= bool(self.unhandled_input(key))
             else:
                 something_handled = True
 

urwid/event_loop/zmq_loop.py

@@ -62,11 +62,11 @@ class ZMQEventLoop(EventLoop):
 
     _alarm_break = count()
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self.logger = logging.getLogger(__name__).getChild(self.__class__.__name__)
         self._did_something = True
-        self._alarms = []
+        self._alarms: list[tuple[float, int, Callable[[], typing.Any]]] = []
         self._poller = zmq.Poller()
         self._queue_callbacks: dict[int, Callable[[], typing.Any]] = {}
         self._idle_handle = 0

urwid/numedit.py

@@ -79,7 +79,11 @@ class NumEdit(Edit):
             return self._allow_negative and ch == "-" and self.edit_pos == 0 and "-" not in self.edit_text
         return False
 
-    def keypress(self, size: tuple[int], key: str) -> str | None:
+    def keypress(
+        self,
+        size: tuple[int],  # type: ignore[override]
+        key: str,
+    ) -> str | None:
         """
         Handle editing keystrokes.  Remove leading zeros.
 

urwid/signals.py

@@ -65,7 +65,7 @@ class Key:
 class Signals:
     _signal_attr = "_urwid_signals"  # attribute to attach to signal senders
 
-    def __init__(self):
+    def __init__(self) -> None:
         self._supported = {}
 
     def register(self, sig_cls, signals: Container[Hashable]) -> None:

urwid/str_util.py

@@ -29,7 +29,6 @@ import wcwidth
 if typing.TYPE_CHECKING:
     from typing_extensions import Literal
 
-UNICODE_VERSION = "15.1.0"  # Use explicit version
 SAFE_ASCII_RE = re.compile("^[ -~]*$")
 SAFE_ASCII_BYTES_RE = re.compile(b"^[ -~]*$")
 
@@ -37,7 +36,7 @@ _byte_encoding: Literal["utf8", "narrow", "wide"] = "narrow"
 
 
 def get_char_width(char: str) -> Literal[0, 1, 2]:
-    width = wcwidth.wcwidth(char, UNICODE_VERSION)
+    width = wcwidth.wcwidth(char)
     if width < 0:
         return 0
     return width

urwid/text_layout.py

@@ -94,7 +94,7 @@ class CanNotDisplayText(Exception):
 
 
 class StandardTextLayout(TextLayout):
-    def __init__(self):  # , tab_stops=(), tab_stop_every=8):
+    def __init__(self) -> None:  # , tab_stops=(), tab_stop_every=8):
         pass
         # """
         # tab_stops -- list of screen column indexes for tab stops
@@ -181,7 +181,7 @@ class StandardTextLayout(TextLayout):
         """Calculate text segments for cases of a text trimmed (wrap is clip or ellipsis)."""
         segments = []
 
-        nl = "\n" if isinstance(text, str) else b"\n"
+        nl: str | bytes = "\n" if isinstance(text, str) else b"\n"
         encoding = get_encoding()
         ellipsis_string = get_ellipsis_string(encoding)
         ellipsis_width = _get_width(ellipsis_string)
@@ -508,7 +508,11 @@ def trim_line(
     return result
 
 
-def calc_line_pos(text: str | bytes, line_layout, pref_col: Literal["left", "right"] | int):
+def calc_line_pos(
+    text: str | bytes,
+    line_layout,
+    pref_col: Literal["left", "right", Align.LEFT, Align.RIGHT] | int,
+):
     """
     Calculate the closest linear position to pref_col given a
     line layout structure.  Returns None if no position found.
@@ -566,7 +570,7 @@ def calc_line_pos(text: str | bytes, line_layout, pref_col: Literal["left", "rig
 def calc_pos(
     text: str | bytes,
     layout: list[list[tuple[int, int, int | bytes] | tuple[int, int | None]]],
-    pref_col: Literal["left", "right"] | int,
+    pref_col: Literal["left", "right", Align.LEFT, Align.RIGHT] | int,
     row: int,
 ) -> int:
     """

urwid/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.4'
-__version_tuple__ = version_tuple = (2, 6, 4)
+__version__ = version = '2.6.6'
+__version_tuple__ = version_tuple = (2, 6, 6)

urwid/vterm.py

@@ -721,7 +721,7 @@ class TermCanvas(Canvas):
         x, y = self.term_cursor
 
         if isinstance(char, int):
-            char = chr(char)
+            char = char.to_bytes(1, "little")
 
         dc = self.modes.display_ctrl
 
@@ -986,14 +986,14 @@ class TermCanvas(Canvas):
             chars = 1
 
         if char is None:
-            char = self.empty_char()
+            char_spec = self.empty_char()
         else:
-            char = (self.attrspec, self.charset.current, char)
+            char_spec = (self.attrspec, self.charset.current, char)
 
         x, y = position
 
         while chars > 0:
-            self.term[y].insert(x, char)
+            self.term[y].insert(x, char_spec)
             self.term[y].pop()
             chars -= 1
 
@@ -1187,19 +1187,19 @@ class TermCanvas(Canvas):
                 return _color_desc_256(color)
             return _BASIC_COLORS[color]
 
-        fg = _defaulter(fg, colors)
-        bg = _defaulter(bg, colors)
+        decoded_fg = _defaulter(fg, colors)
+        decoded_bg = _defaulter(bg, colors)
 
         if attributes:
-            fg = ",".join((fg, *list(attributes)))
+            decoded_fg = ",".join((decoded_fg, *list(attributes)))
 
-        if fg == bg == "default":
+        if decoded_fg == decoded_bg == "default":
             return None
 
         if colors:
-            return AttrSpec(fg, bg, colors=colors)
+            return AttrSpec(decoded_fg, decoded_bg, colors=colors)
 
-        return AttrSpec(fg, bg)
+        return AttrSpec(decoded_fg, decoded_bg)
 
     def csi_set_attr(self, attrs: Sequence[int]) -> None:
         """

urwid/widget/__init__.py

@@ -27,8 +27,10 @@ from .divider import Divider
 from .edit import Edit, EditError, IntEdit
 from .filler import Filler, FillerError, calculate_top_bottom_filler
 from .frame import Frame, FrameError
-from .grid_flow import GridFlow, GridFlowError
+from .grid_flow import GridFlow, GridFlowError, GridFlowWarning
 from .line_box import LineBox
+from .listbox import ListBox, ListBoxError, ListWalker, ListWalkerError, SimpleFocusListWalker, SimpleListWalker
+from .monitored_list import MonitoredFocusList, MonitoredList
 from .overlay import Overlay, OverlayError, OverlayWarning
 from .padding import Padding, PaddingError, PaddingWarning, calculate_left_right_padding
 from .pile import Pile, PileError, PileWarning
@@ -37,6 +39,7 @@ from .progress_bar import ProgressBar
 from .scrollable import Scrollable, ScrollableError, ScrollBar
 from .solid_fill import SolidFill
 from .text import Text, TextError
+from .treetools import ParentNode, TreeListBox, TreeNode, TreeWalker, TreeWidget, TreeWidgetError
 from .widget import (
     BoxWidget,
     FixedWidget,
@@ -58,6 +61,8 @@ from .wimp import Button, CheckBox, CheckBoxError, RadioButton, SelectableIcon
 __all__ = (
     "ANY",
     "BOTTOM",
+    "MonitoredList",
+    "MonitoredFocusList",
     "BOX",
     "CENTER",
     "CLIP",
@@ -67,6 +72,7 @@ __all__ = (
     "GIVEN",
     "LEFT",
     "MIDDLE",
+    "GridFlowWarning",
     "PACK",
     "RELATIVE",
     "RELATIVE_100",
@@ -85,8 +91,20 @@ __all__ = (
     "BoxAdapter",
     "BoxAdapterError",
     "BoxWidget",
+    "ListWalkerError",
+    "ListWalker",
+    "SimpleListWalker",
+    "SimpleFocusListWalker",
+    "ListBoxError",
+    "ListBox",
     "Button",
     "CheckBox",
+    "TreeWidgetError",
+    "TreeWidget",
+    "TreeNode",
+    "ParentNode",
+    "TreeWalker",
+    "TreeListBox",
     "CheckBoxError",
     "Columns",
     "ColumnsError",

urwid/widget/bar_graph.py

@@ -611,7 +611,11 @@ class GraphVScale(Widget):
         """
         return False
 
-    def render(self, size: tuple[int, int], focus: bool = False) -> SolidCanvas | CompositeCanvas:
+    def render(
+        self,
+        size: tuple[int, int],
+        focus: bool = False,
+    ) -> SolidCanvas | CompositeCanvas:
         """
         Render GraphVScale.
         """
@@ -636,10 +640,10 @@ class GraphVScale(Widget):
         if not combinelist:
             return SolidCanvas(" ", size[0], size[1])
 
-        c = CanvasCombine(combinelist)
+        canvas = CanvasCombine(combinelist)
         if maxrow - rows:
-            c.pad_trim_top_bottom(0, maxrow - rows)
-        return c
+            canvas.pad_trim_top_bottom(0, maxrow - rows)
+        return canvas
 
 
 def scale_bar_values(bar, top: float, maxrow: int) -> list[int]:

urwid/widget/big_text.py

@@ -9,6 +9,8 @@ from .constants import Sizing
 from .widget import Widget, fixed_size
 
 if typing.TYPE_CHECKING:
+    from collections.abc import Hashable
+
     from urwid import Font
 
 
@@ -41,16 +43,24 @@ class BigText(Widget):
         self.font = font
         self._invalidate()
 
-    def pack(self, size: tuple[()] | None = None, focus: bool = False) -> tuple[int, int]:
+    def pack(
+        self,
+        size: tuple[()] | None = (),  # type: ignore[override]
+        focus: bool = False,
+    ) -> tuple[int, int]:
         rows = self.font.height
         cols = 0
         for c in self.text:
             cols += self.font.char_width(c)
         return cols, rows
 
-    def render(self, size: tuple[()], focus: bool = False) -> CompositeCanvas:
+    def render(
+        self,
+        size: tuple[()],  # type: ignore[override]
+        focus: bool = False,
+    ) -> CompositeCanvas:
         fixed_size(size)  # complain if parameter is wrong
-        a = None
+        a: Hashable | None = None
         ai = ak = 0
         o = []
         rows = self.font.height
@@ -64,7 +74,7 @@ class BigText(Widget):
             if not width:
                 # ignore invalid characters
                 continue
-            c = self.font.render(ch)
+            c: TextCanvas | CompositeCanvas = self.font.render(ch)
             if a is not None:
                 c = CompositeCanvas(c)
                 c.fill_attr(a)