urwid 2.6.15__py3-none-any.whl → 3.0.5__py3-none-any.whl

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
 
@@ -375,7 +340,7 @@ class TermCanvas(Canvas):
             lines = self.height // 2
 
         if not up:
-            lines = -lines  # pylint: disable=invalid-unary-operand-type  # type already narrowed
+            lines = -lines
 
         maxscroll = len(self.scrollback_buffer)
         self.scrolling_up += lines
@@ -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])
@@ -1118,6 +1083,14 @@ class TermCanvas(Canvas):
             elif 40 <= attr <= 47:
                 bg = attr - 40
                 colors = max(16, colors)
+            # AIXTERM bright color spec
+            # https://en.wikipedia.org/wiki/ANSI_escape_code
+            elif 90 <= attr <= 97:
+                fg = attr - 90 + 8
+                colors = max(16, colors)
+            elif 100 <= attr <= 107:
+                bg = attr - 100 + 8
+                colors = max(16, colors)
             elif attr in {38, 48}:
                 if idx + 2 < len(attrs) and attrs[idx + 1] == 5:
                     # 8 bit color specification
@@ -1264,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,
@@ -1445,8 +1418,8 @@ class TermCanvas(Canvas):
         if self.scrolling_up == 0:
             yield from self.term
         else:
-            buf = self.scrollback_buffer + self.term
-            yield from buf[-(self.height + self.scrolling_up) : -self.scrolling_up]
+            viewport_range = slice(-(self.height + self.scrolling_up), -self.scrolling_up)
+            yield from (*self.scrollback_buffer, *self.term)[viewport_range]
 
     def content_delta(self, other: Canvas):
         if other is 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_map.py

@@ -42,19 +42,19 @@ class AttrMap(delegate_to_widget_mixin("_original_widget"), WidgetDecoration[Wra
         :type focus_map: display attribute or dict
 
         >>> from urwid import Divider, Edit, Text
-        >>> AttrMap(Divider(u"!"), 'bright')
+        >>> AttrMap(Divider("!"), "bright")
         <AttrMap flow widget <Divider flow widget '!'> attr_map={None: 'bright'}>
-        >>> AttrMap(Edit(), 'notfocus', 'focus').attr_map
+        >>> AttrMap(Edit(), "notfocus", "focus").attr_map
         {None: 'notfocus'}
-        >>> AttrMap(Edit(), 'notfocus', 'focus').focus_map
+        >>> AttrMap(Edit(), "notfocus", "focus").focus_map
         {None: 'focus'}
         >>> size = (5,)
-        >>> am = AttrMap(Text(u"hi"), 'greeting', 'fgreet')
-        >>> next(am.render(size, focus=False).content()) # ... = b in Python 3
+        >>> am = AttrMap(Text("hi"), "greeting", "fgreet")
+        >>> next(am.render(size, focus=False).content())  # ... = b in Python 3
         [('greeting', None, ...'hi   ')]
         >>> next(am.render(size, focus=True).content())
         [('fgreet', None, ...'hi   ')]
-        >>> am2 = AttrMap(Text(('word', u"hi")), {'word':'greeting', None:'bg'})
+        >>> am2 = AttrMap(Text(("word", "hi")), {"word": "greeting", None: "bg"})
         >>> am2
         <AttrMap fixed/flow widget <Text fixed/flow widget 'hi'> attr_map={'word': 'greeting', None: 'bg'}>
         >>> next(am2.render(size).content())
@@ -94,8 +94,8 @@ class AttrMap(delegate_to_widget_mixin("_original_widget"), WidgetDecoration[Wra
         constructor does.  You must specify {None: attribute} instead.
 
         >>> from urwid import Text
-        >>> w = AttrMap(Text(u"hi"), None)
-        >>> w.set_attr_map({'a':'b'})
+        >>> w = AttrMap(Text("hi"), None)
+        >>> w.set_attr_map({"a": "b"})
         >>> w
         <AttrMap fixed/flow widget <Text fixed/flow widget 'hi'> attr_map={'a': 'b'}>
         """
@@ -129,8 +129,8 @@ class AttrMap(delegate_to_widget_mixin("_original_widget"), WidgetDecoration[Wra
         constructor does.  You must specify {None: attribute} instead.
 
         >>> from urwid import Text
-        >>> w = AttrMap(Text(u"hi"), {})
-        >>> w.set_focus_map({'a':'b'})
+        >>> w = AttrMap(Text("hi"), {})
+        >>> w.set_focus_map({"a": "b"})
         >>> w
         <AttrMap fixed/flow widget <Text fixed/flow widget 'hi'> attr_map={} focus_map={'a': 'b'}>
         >>> w.set_focus_map(None)

urwid/widget/attr_wrap.py

@@ -25,12 +25,12 @@ class AttrWrap(AttrMap):
         new code should use AttrMap instead.
 
         >>> from urwid import Divider, Edit, Text
-        >>> AttrWrap(Divider(u"!"), 'bright')
+        >>> AttrWrap(Divider("!"), "bright")
         <AttrWrap flow widget <Divider flow widget '!'> attr='bright'>
-        >>> AttrWrap(Edit(), 'notfocus', 'focus')
+        >>> AttrWrap(Edit(), "notfocus", "focus")
         <AttrWrap selectable flow widget <Edit selectable flow widget '' edit_pos=0> attr='notfocus' focus_attr='focus'>
         >>> size = (5,)
-        >>> aw = AttrWrap(Text(u"hi"), 'greeting', 'fgreet')
+        >>> aw = AttrWrap(Text("hi"), "greeting", "fgreet")
         >>> next(aw.render(size, focus=False).content())
         [('greeting', None, ...'hi   ')]
         >>> next(aw.render(size, focus=True).content())
@@ -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 = []
@@ -410,7 +405,7 @@ class BarGraph(Widget, metaclass=BarGraphMeta):
                     if len(bar_type) == 3:
                         # vertical eighths
                         fg, bg, k = bar_type
-                        a = self.satt[(fg, bg)]
+                        a = self.satt[fg, bg]
                         t = self.eighths[k] * width
                     else:
                         # horizontal lines
@@ -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,14 @@ class BigText(Widget):
                 a, ak = attrib[ai]
                 ai += 1
             ak -= 1
-            width = self.font.char_width(ch)
-            if not width:
-                # 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 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))
+
         if o:
             canv = CanvasJoin(o)
         else:

urwid/widget/box_adapter.py

@@ -32,7 +32,7 @@ class BoxAdapter(WidgetDecoration[WrappedWidget]):
         :type height: int
 
         >>> from urwid import SolidFill
-        >>> BoxAdapter(SolidFill(u"x"), 5) # 5-rows of x's
+        >>> BoxAdapter(SolidFill("x"), 5)  # 5-rows of x's
         <BoxAdapter flow widget <SolidFill box widget 'x'> height=5>
         """
         if hasattr(box_widget, "sizing") and Sizing.BOX not in box_widget.sizing():
@@ -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
@@ -71,7 +71,7 @@ class BoxAdapter(WidgetDecoration[WrappedWidget]):
         Return the predetermined height (behave like a flow widget)
 
         >>> from urwid import SolidFill
-        >>> BoxAdapter(SolidFill(u"x"), 5).rows((20,))
+        >>> BoxAdapter(SolidFill("x"), 5).rows((20,))
         5
         """
         return self.height