urwid 2.6.16__py3-none-any.whl → 3.0.1__py3-none-any.whl

urwid/event_loop/main_loop.py

@@ -172,7 +172,8 @@ class MainLoop:
     def _set_widget(self, widget: Widget) -> None:
         warnings.warn(
             f"method `{self.__class__.__name__}._set_widget` is deprecated, "
-            f"please use `{self.__class__.__name__}.widget` property",
+            f"please use `{self.__class__.__name__}.widget` property."
+            "API will be removed in version 4.0.",
             DeprecationWarning,
             stacklevel=2,
         )
@@ -193,7 +194,8 @@ class MainLoop:
     def _set_pop_ups(self, pop_ups: bool) -> None:
         warnings.warn(
             f"method `{self.__class__.__name__}._set_pop_ups` is deprecated, "
-            f"please use `{self.__class__.__name__}.pop_ups` property",
+            f"please use `{self.__class__.__name__}.pop_ups` property."
+            "API will be removed in version 4.0.",
             DeprecationWarning,
             stacklevel=2,
         )
@@ -460,9 +462,7 @@ class MainLoop:
         widget.mouse_event((15, 5), 'mouse press', 1, 5, 4, focus=True)
         >>> ml._update([], [])
         """
-        keys = self.input_filter(keys, raw)
-
-        if keys:
+        if keys := self.input_filter(keys, raw):
             self.process_input(keys)
             if "window resize" in keys:
                 self.screen_size = None
@@ -493,19 +493,14 @@ class MainLoop:
                 else:
                     self.screen.set_input_timeouts(None)
                 keys, raw = self.screen.get_input(True)
-                if not keys and next_alarm:
-                    sec = next_alarm[0] - time.time()
-                    if sec <= 0:
-                        break
-
-            keys = self.input_filter(keys, raw)
+                if not keys and next_alarm and next_alarm[0] - time.time() <= 0:
+                    break
 
-            if keys:
+            if keys := self.input_filter(keys, raw):
                 self.process_input(keys)
 
             while next_alarm:
-                sec = next_alarm[0] - time.time()
-                if sec > 0:
+                if (next_alarm[0] - time.time()) > 0:
                     break
                 _tm, _tie_break, callback = next_alarm
                 callback()
@@ -563,13 +558,13 @@ class MainLoop:
 
             if isinstance(key, str):
                 if self._topmost_widget.selectable():
-                    handled_key = self._topmost_widget.keypress(self.screen_size, key)
-                    if not handled_key:
+                    if handled_key := self._topmost_widget.keypress(self.screen_size, key):
+                        key = handled_key  # noqa: PLW2901
+
+                    else:
                         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(

urwid/event_loop/tornado_loop.py

@@ -155,12 +155,11 @@ class TornadoEventLoop(EventLoop):
         return handle
 
     def remove_watch_file(self, handle: int) -> bool:
-        fd = self._watch_handles.pop(handle, None)
-        if fd is None:
-            return False
+        if (fd := self._watch_handles.pop(handle, None)) is not None:
+            self._loop.remove_handler(fd)
+            return True
 
-        self._loop.remove_handler(fd)
-        return True
+        return False
 
     def enter_idle(self, callback: Callable[[], typing.Any]) -> int:
         """

urwid/event_loop/trio_loop.py

@@ -261,7 +261,7 @@ class TrioEventLoop(EventLoop):
         """
         for task, scope, args in self._pending_tasks:
             self._nursery.start_soon(task, scope, *args)
-        del self._pending_tasks[:]
+        self._pending_tasks.clear()
 
     def _start_task(
         self,

urwid/font.py

@@ -29,7 +29,7 @@ from urwid.display.escape import SAFE_ASCII_DEC_SPECIAL_RE
 from urwid.util import apply_target_encoding, str_util
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Iterable, Iterator, Sequence
+    from collections.abc import Iterator, Sequence
 
     from typing_extensions import Literal
 
@@ -206,12 +206,10 @@ class Font(metaclass=FontRegistry):
         self.canvas: dict[str, TextCanvas] = {}
         self.utf8_required = False
         if isinstance(self.data, str):
-            self.add_glyphs(self._to_text(self.data))
+            self.add_glyphs(self.data)
 
         else:
-            data: Iterable[str] = (self._to_text(block) for block in self.data)
-
-            for gdata in data:
+            for gdata in self.data:
                 self.add_glyphs(gdata)
 
     def __repr__(self) -> str:
@@ -223,22 +221,19 @@ class Font(metaclass=FontRegistry):
 
     @staticmethod
     def _to_text(
-        obj: str | bytes,
+        obj: str,
         encoding: str = "utf-8",
         errors: Literal["strict", "ignore", "replace"] = "strict",
     ) -> str:
+        warnings.warn(
+            "_to_text is deprecated: only text fonts are supported. API will be removed in version 4.0.",
+            DeprecationWarning,
+            stacklevel=3,
+        )
         if isinstance(obj, str):
             return obj
 
-        if isinstance(obj, bytes):
-            warnings.warn(
-                "Bytes based fonts are deprecated, please switch to the text one",
-                DeprecationWarning,
-                stacklevel=3,
-            )
-            return obj.decode(encoding, errors)
-
-        raise TypeError(f"{obj!r} is not str|bytes")
+        raise TypeError(f"{obj!r} is not str")
 
     def add_glyphs(self, gdata: str) -> None:
         d, utf8_required = separate_glyphs(gdata, self.height)

urwid/signals.py

@@ -20,6 +20,7 @@
 
 from __future__ import annotations
 
+import abc
 import itertools
 import typing
 import warnings
@@ -29,7 +30,7 @@ if typing.TYPE_CHECKING:
     from collections.abc import Callable, Collection, Container, Hashable, Iterable
 
 
-class MetaSignals(type):
+class MetaSignals(abc.ABCMeta):
     """
     register the list of signals in the class variable signals,
     including signals in superclasses.

urwid/str_util.py

@@ -29,17 +29,17 @@ import wcwidth
 if typing.TYPE_CHECKING:
     from typing_extensions import Literal
 
-SAFE_ASCII_RE = re.compile("^[ -~]*$")
-SAFE_ASCII_BYTES_RE = re.compile(b"^[ -~]*$")
+SAFE_ASCII_RE = re.compile(r"^[ -~]*$")
+SAFE_ASCII_BYTES_RE = re.compile(rb"^[ -~]*$")
 
 _byte_encoding: Literal["utf8", "narrow", "wide"] = "narrow"
 
 
 def get_char_width(char: str) -> Literal[0, 1, 2]:
-    width = wcwidth.wcwidth(char)
-    if width < 0:
-        return 0
-    return width
+    if (width := wcwidth.wcwidth(char)) >= 0:
+        return width
+
+    return 0
 
 
 def get_width(o: int) -> Literal[0, 1, 2]:
@@ -86,10 +86,9 @@ def decode_one(text: bytes | str, pos: int) -> tuple[int, int]:
     if b1 & 0xE0 == 0xC0:
         if b2 & 0xC0 != 0x80:
             return error
-        o = ((b1 & 0x1F) << 6) | (b2 & 0x3F)
-        if o < 0x80:
-            return error
-        return o, pos + 2
+        if (o := ((b1 & 0x1F) << 6) | (b2 & 0x3F)) >= 0x80:
+            return o, pos + 2
+        return error
     if lt < 3:
         return error
     if b1 & 0xF0 == 0xE0:
@@ -97,10 +96,9 @@ def decode_one(text: bytes | str, pos: int) -> tuple[int, int]:
             return error
         if b3 & 0xC0 != 0x80:
             return error
-        o = ((b1 & 0x0F) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F)
-        if o < 0x800:
-            return error
-        return o, pos + 3
+        if (o := ((b1 & 0x0F) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F)) >= 0x800:
+            return o, pos + 3
+        return error
     if lt < 4:
         return error
     if b1 & 0xF8 == 0xF0:
@@ -110,10 +108,9 @@ def decode_one(text: bytes | str, pos: int) -> tuple[int, int]:
             return error
         if b4 & 0xC0 != 0x80:
             return error
-        o = ((b1 & 0x07) << 18) | ((b2 & 0x3F) << 12) | ((b3 & 0x3F) << 6) | (b4 & 0x3F)
-        if o < 0x10000:
-            return error
-        return o, pos + 4
+        if (o := ((b1 & 0x07) << 18) | ((b2 & 0x3F) << 12) | ((b3 & 0x3F) << 6) | (b4 & 0x3F)) >= 0x10000:
+            return o, pos + 4
+        return error
     return error
 
 

urwid/text_layout.py

@@ -461,7 +461,7 @@ def shift_line(
         # existing shift
         amount += segs[0][0]
         if amount:
-            return [(amount, None)] + segs[1:]
+            return [(amount, None), *segs[1:]]
         return segs[1:]
 
     if amount:
@@ -581,8 +581,7 @@ def calc_pos(
     if row < 0 or row >= len(layout):
         raise ValueError("calculate_pos: out of layout row range")
 
-    pos = calc_line_pos(text, layout[row], pref_col)
-    if pos is not None:
+    if (pos := calc_line_pos(text, layout[row], pref_col)) is not None:
         return pos
 
     rows_above = list(range(row - 1, -1, -1))
@@ -590,14 +589,14 @@ def calc_pos(
     while rows_above and rows_below:
         if rows_above:
             r = rows_above.pop(0)
-            pos = calc_line_pos(text, layout[r], pref_col)
-            if pos is not None:
+            if (pos := calc_line_pos(text, layout[r], pref_col)) is not None:
                 return pos
+
         if rows_below:
             r = rows_below.pop(0)
-            pos = calc_line_pos(text, layout[r], pref_col)
-            if pos is not None:
+            if (pos := calc_line_pos(text, layout[r], pref_col)) is not None:
                 return pos
+
     return 0
 
 

urwid/util.py

@@ -493,24 +493,13 @@ def is_mouse_press(ev: str) -> bool:
 
 
 class MetaSuper(type):
-    """adding .__super"""
+    """Deprecated metaclass.
 
-    def __init__(cls, name: str, bases, d):
-        super().__init__(name, bases, d)
-        if hasattr(cls, f"_{name}__super"):
-            raise AttributeError("Class has same name as one of its super classes")
-
-        @property
-        def _super(self):
-            warnings.warn(
-                f"`{name}.__super` was a deprecated feature for old python versions."
-                f"Please use `super()` call instead.",
-                DeprecationWarning,
-                stacklevel=3,
-            )
-            return super(cls, self)
+    Present only for code compatibility, all logic has been removed.
+    Please move to the last position in the class bases to allow future changes.
+    """
 
-        setattr(cls, f"_{name}__super", _super)
+    __slots__ = ()
 
 
 def int_scale(val: int, val_range: int, out_range: int) -> int:
@@ -534,7 +523,7 @@ def int_scale(val: int, val_range: int, out_range: int) -> int:
     return num // dem
 
 
-class StoppingContext(typing.ContextManager["StoppingContext"]):
+class StoppingContext(contextlib.AbstractContextManager["StoppingContext"]):
     """Context manager that calls ``stop`` on a given object on exit.  Used to
     make the ``start`` method on `MainLoop` and `BaseScreen` optionally act as
     context managers.

urwid/version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.16'
-__version_tuple__ = version_tuple = (2, 6, 16)
+__version__ = version = '3.0.1'
+__version_tuple__ = version_tuple = (3, 0, 1)

urwid/vterm.py

@@ -35,7 +35,6 @@ import termios
 import time
 import traceback
 import typing
-import warnings
 from collections import deque
 from contextlib import suppress
 from dataclasses import dataclass
@@ -248,8 +247,7 @@ class TermCharset:
 
     def apply_mapping(self, char: bytes) -> bytes:
         if self._sgr_mapping or self._g[self.active] == "ibmpc":
-            dec_pos = DEC_SPECIAL_CHARS.find(char.decode("cp437"))
-            if dec_pos >= 0:
+            if (dec_pos := DEC_SPECIAL_CHARS.find(char.decode("cp437"))) >= 0:
                 self.current = "0"
                 return ALT_DEC_SPECIAL_CHARS[dec_pos].encode("cp437")
 
@@ -259,39 +257,6 @@ class TermCharset:
         return char
 
 
-class TermScroller(list):
-    """
-    List subclass that handles the terminal scrollback buffer,
-    truncating it as necessary.
-    """
-
-    SCROLLBACK_LINES = 10000
-
-    def __init__(self, iterable: Iterable[typing.Any]) -> None:
-        warnings.warn(
-            "`TermScroller` is deprecated. Please use `collections.deque` with non-zero `maxlen` instead.",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        super().__init__(iterable)
-
-    def trunc(self) -> None:
-        if len(self) >= self.SCROLLBACK_LINES:
-            self.pop(0)
-
-    def append(self, obj) -> None:
-        self.trunc()
-        super().append(obj)
-
-    def insert(self, idx: typing.SupportsIndex, obj) -> None:
-        self.trunc()
-        super().insert(idx, obj)
-
-    def extend(self, seq) -> None:
-        self.trunc()
-        super().extend(seq)
-
-
 class TermCanvas(Canvas):
     cacheable = False
 
@@ -489,8 +454,7 @@ class TermCanvas(Canvas):
                     continue
 
                 # adjust x axis of scrollback buffer to the current width
-                padding = self.width - len(last_line)
-                if padding > 0:
+                if (padding := self.width - len(last_line)) > 0:
                     last_line += [self.empty_char()] * padding
                 else:
                     last_line = last_line[: self.width]
@@ -549,8 +513,7 @@ class TermCanvas(Canvas):
 
             escbuf.append(num)
 
-        cmd_ = CSI_COMMANDS[char]
-        if cmd_ is not None:
+        if (cmd_ := CSI_COMMANDS[char]) is not None:
             if isinstance(cmd_, CSIAlias):
                 csi_cmd: CSICommand = CSI_COMMANDS[cmd_.alias]  # type: ignore[assignment]
             elif isinstance(cmd_, CSICommand):
@@ -699,11 +662,13 @@ class TermCanvas(Canvas):
 
                 # end multibyte sequence
                 self.utf8_eat_bytes = None
-                sequence = (self.utf8_buffer + bytes([byte])).decode("utf-8", "ignore")
-                if not sequence:
+
+                if sequence := (self.utf8_buffer + bytes([byte])).decode("utf-8", "ignore"):
+                    char = sequence.encode(util.get_encoding(), "replace")
+
+                else:
                     # invalid multibyte sequence, stop processing
                     return
-                char = sequence.encode(util.get_encoding(), "replace")
             else:
                 self.utf8_eat_bytes = None
                 char = bytes([byte])
@@ -1272,7 +1237,7 @@ class TermCanvas(Canvas):
             for x in range(self.width):
                 char = self.term[y][x]
                 attrs = self.reverse_attrspec(char[0], undo=undo)
-                self.term[y][x] = (attrs,) + char[1:]
+                self.term[y][x] = (attrs, *char[1:])
 
     def set_mode(
         self,

urwid/widget/__init__.py

@@ -41,9 +41,6 @@ from .solid_fill import SolidFill
 from .text import Text, TextError
 from .treetools import ParentNode, TreeListBox, TreeNode, TreeWalker, TreeWidget, TreeWidgetError
 from .widget import (
-    BoxWidget,
-    FixedWidget,
-    FlowWidget,
     Widget,
     WidgetError,
     WidgetMeta,
@@ -87,7 +84,6 @@ __all__ = (
     "BigText",
     "BoxAdapter",
     "BoxAdapterError",
-    "BoxWidget",
     "Button",
     "CheckBox",
     "CheckBoxError",
@@ -99,8 +95,6 @@ __all__ = (
     "EditError",
     "Filler",
     "FillerError",
-    "FixedWidget",
-    "FlowWidget",
     "Frame",
     "FrameError",
     "GraphVScale",

urwid/widget/attr_wrap.py

@@ -47,8 +47,7 @@ class AttrWrap(AttrMap):
         # only include the focus_attr when it takes effect (not None)
         d = {**super()._repr_attrs(), "attr": self.attr}
         del d["attr_map"]
-        if "focus_map" in d:
-            del d["focus_map"]
+        d.pop("focus_map", None)
         if self.focus_attr is not None:
             d["focus_attr"] = self.focus_attr
         return d
@@ -57,8 +56,8 @@ class AttrWrap(AttrMap):
     def w(self) -> Widget:
         """backwards compatibility, widget used to be stored as w"""
         warnings.warn(
-            "backwards compatibility, widget used to be stored as original_widget",
-            PendingDeprecationWarning,
+            "backwards compatibility, widget used to be stored as original_widget. API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         return self.original_widget
@@ -66,15 +65,15 @@ class AttrWrap(AttrMap):
     @w.setter
     def w(self, new_widget: Widget) -> None:
         warnings.warn(
-            "backwards compatibility, widget used to be stored as original_widget",
-            PendingDeprecationWarning,
+            "backwards compatibility, widget used to be stored as original_widget. API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         self.original_widget = new_widget
 
     def get_w(self):
         warnings.warn(
-            "backwards compatibility, widget used to be stored as original_widget",
+            "backwards compatibility, widget used to be stored as original_widget. API will be removed in version 4.0.",
             DeprecationWarning,
             stacklevel=2,
         )
@@ -82,7 +81,7 @@ class AttrWrap(AttrMap):
 
     def set_w(self, new_widget: Widget) -> None:
         warnings.warn(
-            "backwards compatibility, widget used to be stored as original_widget",
+            "backwards compatibility, widget used to be stored as original_widget. API will be removed in version 4.0.",
             DeprecationWarning,
             stacklevel=2,
         )
@@ -105,8 +104,7 @@ class AttrWrap(AttrMap):
     attr = property(get_attr, set_attr)
 
     def get_focus_attr(self) -> Hashable | None:
-        focus_map = self.focus_map
-        if focus_map:
+        if focus_map := self.focus_map:
             return focus_map[None]
         return None
 

urwid/widget/bar_graph.py

@@ -269,12 +269,7 @@ class BarGraph(Widget, metaclass=BarGraphMeta):
             ]
 
         # reverse the hlines to match screen ordering
-        rhl = []
-        for h in hlines:
-            rh = float(top - h) * maxrow / top - shiftr
-            if rh < 0:
-                continue
-            rhl.append(rh)
+        rhl = [rh for h in hlines if (rh := float(top - h) * maxrow / top - shiftr) >= 0]
 
         # build a list of rows that will have hlines
         hrows = []
@@ -562,7 +557,7 @@ def calculate_bargraph_display(bardata, top: float, bar_widths: list[int], maxro
             la, ln = last[i]
 
         if i < len(last):
-            o += [(la, ln)] + last[i + 1 :]
+            o += [(la, ln), *last[i + 1 :]]
         last = o
         y_count += 1
 

urwid/widget/big_text.py

@@ -70,15 +70,17 @@ class BigText(Widget):
                 a, ak = attrib[ai]
                 ai += 1
             ak -= 1
-            width = self.font.char_width(ch)
-            if not width:
+
+            if width := self.font.char_width(ch):
+                c: TextCanvas | CompositeCanvas = self.font.render(ch)
+                if a is not None:
+                    c = CompositeCanvas(c)
+                    c.fill_attr(a)
+                o.append((c, None, False, width))
+
+            else:
                 # ignore invalid characters
                 continue
-            c: TextCanvas | CompositeCanvas = self.font.render(ch)
-            if a is not None:
-                c = CompositeCanvas(c)
-                c.fill_attr(a)
-            o.append((c, None, False, width))
         if o:
             canv = CanvasJoin(o)
         else:

urwid/widget/box_adapter.py

@@ -48,8 +48,8 @@ class BoxAdapter(WidgetDecoration[WrappedWidget]):
     @property
     def box_widget(self) -> WrappedWidget:
         warnings.warn(
-            "original stored as original_widget, keep for compatibility",
-            PendingDeprecationWarning,
+            "original stored as original_widget, keep for compatibility. API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         return self.original_widget
@@ -57,8 +57,8 @@ class BoxAdapter(WidgetDecoration[WrappedWidget]):
     @box_widget.setter
     def box_widget(self, widget: WrappedWidget) -> None:
         warnings.warn(
-            "original stored as original_widget, keep for compatibility",
-            PendingDeprecationWarning,
+            "original stored as original_widget, keep for compatibility. API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         self.original_widget = widget