urwid 2.6.10__tar.gz → 2.6.12__tar.gz

{urwid-2.6.10 → urwid-2.6.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.10
+Version: 2.6.12
 Summary: A full-featured console (xterm et al.) user interface library
 Home-page: https://urwid.org/
 Author-email: Ian Ward <ian@excess.org>

urwid-2.6.12/black-requirements.txt

@@ -0,0 +1 @@
+black==24.4.2

urwid-2.6.12/docs/examples/bigtext.py.xdotool

@@ -0,0 +1,3 @@
+windowsize --usehints $RXVTWINDOWID 39 21
+key --window $RXVTWINDOWID Down Down Down Down Down Down Down Down Return
+key --window $RXVTWINDOWID Up Up Up Return

{urwid-2.6.10 → urwid-2.6.12}/docs/examples/browse.py

@@ -6,5 +6,5 @@ import os
 
 import real_browse
 
-os.chdir("/usr/share/doc/python")
+os.chdir("/usr/share/doc/python3")
 real_browse.main()

{urwid-2.6.10 → urwid-2.6.12}/docs/examples/graph.py

@@ -209,8 +209,30 @@ class GraphView(urwid.WidgetWrap):
         bg = urwid.AttrMap(urwid.SolidFill("▒"), "screen edge")
         shadow = urwid.AttrMap(urwid.SolidFill(" "), "main shadow")
 
-        bg = urwid.Overlay(shadow, bg, ("fixed left", 3), ("fixed right", 1), ("fixed top", 2), ("fixed bottom", 1))
-        w = urwid.Overlay(w, bg, ("fixed left", 2), ("fixed right", 3), ("fixed top", 1), ("fixed bottom", 2))
+        bg = urwid.Overlay(
+            shadow,
+            bg,
+            align=urwid.LEFT,
+            width=urwid.RELATIVE_100,
+            valign=urwid.TOP,
+            height=urwid.RELATIVE_100,
+            left=3,
+            right=1,
+            top=2,
+            bottom=1,
+        )
+        w = urwid.Overlay(
+            w,
+            bg,
+            align=urwid.LEFT,
+            width=urwid.RELATIVE_100,
+            valign=urwid.TOP,
+            height=urwid.RELATIVE_100,
+            left=2,
+            right=3,
+            top=1,
+            bottom=2,
+        )
         return w
 
     def bar_graph(self, smooth=False):
@@ -288,10 +310,10 @@ class GraphView(urwid.WidgetWrap):
     def main_window(self):
         self.graph = self.bar_graph()
         self.graph_wrap = urwid.WidgetWrap(self.graph)
-        vline = urwid.AttrMap(urwid.SolidFill("\u2502"), "line")
+        vline = urwid.AttrMap(urwid.SolidFill("│"), "line")
         c = self.graph_controls()
         w = urwid.Columns([(urwid.WEIGHT, 2, self.graph_wrap), (1, vline), c], dividechars=1, focus_column=2)
-        w = urwid.Padding(w, ("fixed left", 1), ("fixed right", 0))
+        w = urwid.Padding(w, urwid.LEFT, left=1)
         w = urwid.AttrMap(w, "body")
         w = urwid.LineBox(w)
         w = urwid.AttrMap(w, "line")

{urwid-2.6.10 → urwid-2.6.12}/docs/examples/real_browse.py

@@ -346,10 +346,7 @@ def starts_expanded(name: str) -> bool:
     if len(path_elements) > len(_initial_cwd):
         return False
 
-    if path_elements != _initial_cwd[: len(path_elements)]:
-        return False
-
-    return True
+    return path_elements == _initial_cwd[: len(path_elements)]
 
 
 def escape_filename_sh(name: str) -> str:

urwid-2.6.12/docs/examples/tour.py.xdotool

@@ -0,0 +1,2 @@
+windowsize --usehints $RXVTWINDOWID 39 25
+key --window $RXVTWINDOWID Return End

{urwid-2.6.10 → urwid-2.6.12}/examples/browse.py

@@ -346,10 +346,7 @@ def starts_expanded(name: str) -> bool:
     if len(path_elements) > len(_initial_cwd):
         return False
 
-    if path_elements != _initial_cwd[: len(path_elements)]:
-        return False
-
-    return True
+    return path_elements == _initial_cwd[: len(path_elements)]
 
 
 def escape_filename_sh(name: str) -> str:

{urwid-2.6.10 → urwid-2.6.12}/examples/calc.py

@@ -137,9 +137,7 @@ class Cell:
             return False
         if next_cell is None:
             return True
-        if self.op == next_cell.op == "+":
-            return False
-        return True
+        return not (self.op == next_cell.op == "+")
 
     def setup_edit(self) -> None:
         """Create the standard edit widget for this cell."""

{urwid-2.6.10 → urwid-2.6.12}/examples/dialog.py

@@ -68,8 +68,8 @@ class DialogDisplay:
         w = self.frame
 
         # pad area around listbox
-        w = urwid.Padding(w, ("fixed left", 2), ("fixed right", 2))
-        w = urwid.Filler(w, ("fixed top", 1), ("fixed bottom", 1))
+        w = urwid.Padding(w, urwid.LEFT, left=2, right=2)
+        w = urwid.Filler(w, urwid.TOP, urwid.RELATIVE_100, top=1, bottom=1)
         w = urwid.AttrMap(w, "body")
 
         # "shadow" effect

{urwid-2.6.10 → urwid-2.6.12}/examples/graph.py

@@ -209,8 +209,30 @@ class GraphView(urwid.WidgetWrap):
         bg = urwid.AttrMap(urwid.SolidFill("▒"), "screen edge")
         shadow = urwid.AttrMap(urwid.SolidFill(" "), "main shadow")
 
-        bg = urwid.Overlay(shadow, bg, ("fixed left", 3), ("fixed right", 1), ("fixed top", 2), ("fixed bottom", 1))
-        w = urwid.Overlay(w, bg, ("fixed left", 2), ("fixed right", 3), ("fixed top", 1), ("fixed bottom", 2))
+        bg = urwid.Overlay(
+            shadow,
+            bg,
+            align=urwid.LEFT,
+            width=urwid.RELATIVE_100,
+            valign=urwid.TOP,
+            height=urwid.RELATIVE_100,
+            left=3,
+            right=1,
+            top=2,
+            bottom=1,
+        )
+        w = urwid.Overlay(
+            w,
+            bg,
+            align=urwid.LEFT,
+            width=urwid.RELATIVE_100,
+            valign=urwid.TOP,
+            height=urwid.RELATIVE_100,
+            left=2,
+            right=3,
+            top=1,
+            bottom=2,
+        )
         return w
 
     def bar_graph(self, smooth=False):
@@ -288,10 +310,10 @@ class GraphView(urwid.WidgetWrap):
     def main_window(self):
         self.graph = self.bar_graph()
         self.graph_wrap = urwid.WidgetWrap(self.graph)
-        vline = urwid.AttrMap(urwid.SolidFill("\u2502"), "line")
+        vline = urwid.AttrMap(urwid.SolidFill("│"), "line")
         c = self.graph_controls()
         w = urwid.Columns([(urwid.WEIGHT, 2, self.graph_wrap), (1, vline), c], dividechars=1, focus_column=2)
-        w = urwid.Padding(w, ("fixed left", 1), ("fixed right", 0))
+        w = urwid.Padding(w, urwid.LEFT, left=1)
         w = urwid.AttrMap(w, "body")
         w = urwid.LineBox(w)
         w = urwid.AttrMap(w, "line")

urwid-2.6.12/ruff-requirements.txt

@@ -0,0 +1 @@
+ruff==0.4.4

{urwid-2.6.10 → urwid-2.6.12}/tests/test_scrollable.py

@@ -291,6 +291,202 @@ class TestScrollBarListBox(unittest.TestCase):
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
+
+def trivial_AttrMap(widget):
+    return urwid.AttrMap(widget, {})
+
+
+class TestScrollableAttrMap(unittest.TestCase):
+    def test_basic(self):
+        """Test basic init and scroll."""
+        long_content = urwid.Text(LGPL_HEADER)
+        reduced_size = (80, 5)
+        content_size = long_content.pack()
+
+        widget = urwid.Scrollable(trivial_AttrMap(long_content))
+        self.assertEqual(frozenset((urwid.BOX,)), widget.sizing())
+
+        cropped_content_canvas = urwid.CompositeCanvas(long_content.render((reduced_size[0],)))
+        cropped_content_canvas.trim_end(content_size[1] - reduced_size[1])
+        top_decoded = cropped_content_canvas.decoded_text
+
+        self.assertEqual(
+            top_decoded,
+            widget.render(reduced_size).decoded_text,
+        )
+
+        for key_1, key_2 in (("down", "up"), ("page down", "page up"), ("end", "home")):
+            widget.keypress(reduced_size, key_1)
+
+            self.assertNotEqual(top_decoded, widget.render(reduced_size).decoded_text)
+
+            widget.keypress(reduced_size, key_2)
+
+            self.assertEqual(top_decoded, widget.render(reduced_size).decoded_text)
+
+    def test_negative(self):
+        with self.assertRaises(ValueError):
+            urwid.Scrollable(trivial_AttrMap(urwid.SolidFill(" ")))
+
+
+class TestScrollBarAttrMap(unittest.TestCase):
+    def test_basic(self):
+        """Test basic init and scroll.
+
+        Unlike `Scrollable`, `ScrollBar` can be also scrolled with a mouse wheel.
+        """
+
+        long_content = urwid.Text(LGPL_HEADER)
+        reduced_size = (40, 5)
+        widget = urwid.ScrollBar(urwid.Scrollable(trivial_AttrMap(long_content)))
+
+        self.assertEqual(frozenset((urwid.BOX,)), widget.sizing())
+
+        top_position_rendered = (
+            "                                       █",
+            "Copyright (C) <year>  <name of author>  ",
+            "                                        ",
+            "This library is free software; you can  ",
+            "redistribute it and/or                  ",
+        )
+        pos_1_down_rendered = (
+            "Copyright (C) <year>  <name of author>  ",
+            "                                       █",
+            "This library is free software; you can  ",
+            "redistribute it and/or                  ",
+            "modify it under the terms of the GNU    ",
+        )
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.keypress(reduced_size, "down")
+
+        self.assertEqual(pos_1_down_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.keypress(reduced_size, "up")
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.keypress(reduced_size, "page down")
+
+        self.assertEqual(
+            (
+                "redistribute it and/or                  ",
+                "modify it under the terms of the GNU   █",
+                "Lesser General Public                   ",
+                "License as published by the Free        ",
+                "Software Foundation; either             ",
+            ),
+            widget.render(reduced_size).decoded_text,
+        )
+
+        widget.keypress(reduced_size, "page up")
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.keypress(reduced_size, "end")
+
+        self.assertEqual(
+            (
+                "not, write to the Free Software         ",
+                "Foundation, Inc., 51 Franklin Street,   ",
+                "Fifth Floor, Boston, MA  02110-1301     ",
+                "USA                                     ",
+                "                                       █",
+            ),
+            widget.render(reduced_size).decoded_text,
+        )
+
+        widget.keypress(reduced_size, "home")
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.mouse_event(reduced_size, "mouse press", 5, 1, 1, False)
+
+        self.assertEqual(pos_1_down_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.mouse_event(reduced_size, "mouse press", 4, 1, 1, False)
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
+
+class TestScrollBarListBoxAttrMap(unittest.TestCase):
+    def test_relative_non_selectable(self):
+        widget = urwid.ScrollBar(
+            trivial_AttrMap(
+                urwid.ListBox(urwid.SimpleListWalker(urwid.Text(line) for line in LGPL_HEADER.splitlines()))
+            )
+        )
+
+        reduced_size = (40, 5)
+
+        top_position_rendered = (
+            "                                       █",
+            "Copyright (C) <year>  <name of author>  ",
+            "                                        ",
+            "This library is free software; you can  ",
+            "redistribute it and/or                  ",
+        )
+        pos_1_down_rendered = (
+            "Copyright (C) <year>  <name of author>  ",
+            "                                       █",
+            "This library is free software; you can  ",
+            "redistribute it and/or                  ",
+            "modify it under the terms of the GNU    ",
+        )
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.keypress(reduced_size, "down")
+
+        self.assertEqual(pos_1_down_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.keypress(reduced_size, "up")
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.keypress(reduced_size, "page down")
+
+        self.assertEqual(
+            (
+                "modify it under the terms of the GNU    ",
+                "Lesser General Public                  █",
+                "License as published by the Free        ",
+                "Software Foundation; either             ",
+                "version 2.1 of the License, or (at your ",
+            ),
+            widget.render(reduced_size).decoded_text,
+        )
+
+        widget.keypress(reduced_size, "page up")
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.keypress(reduced_size, "end")
+
+        self.assertEqual(
+            (
+                "License along with this library; if     ",
+                "not, write to the Free Software         ",
+                "Foundation, Inc., 51 Franklin Street,   ",
+                "Fifth Floor, Boston, MA  02110-1301     ",
+                "USA                                    █",
+            ),
+            widget.render(reduced_size).decoded_text,
+        )
+
+        widget.keypress(reduced_size, "home")
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.mouse_event(reduced_size, "mouse press", 5, 1, 1, False)
+
+        self.assertEqual(pos_1_down_rendered, widget.render(reduced_size).decoded_text)
+
+        widget.mouse_event(reduced_size, "mouse press", 4, 1, 1, False)
+
+        self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
+
     def test_large_non_selectable(self):
         top = urwid.Text("\n".join(string.ascii_letters))
         bottom = urwid.Text("\n".join(string.digits))

{urwid-2.6.10 → urwid-2.6.12}/urwid/canvas.py

@@ -935,7 +935,7 @@ def shard_body_row(sbody):
         else:  # noqa: PLR5501  # pylint: disable=else-if-used  # readability
             # need to skip this unchanged canvas
             if row and isinstance(row[-1], int):
-                row[-1] = row[-1] + cview[2]
+                row[-1] += cview[2]
             else:
                 row.append(cview[2])
 

{urwid-2.6.10 → urwid-2.6.12}/urwid/display/_raw_display_base.py

@@ -544,9 +544,7 @@ class Screen(BaseScreen, RealTerminal):
         def is_blank_row(row: list[tuple[object, Literal["0", "U"] | None], bytes]) -> bool:
             if len(row) > 1:
                 return False
-            if row[0][2].strip():
-                return False
-            return True
+            return not row[0][2].strip()
 
         def attr_to_escape(a: AttrSpec | str | None) -> str:
             if a in self._pal_escape:

{urwid-2.6.10 → urwid-2.6.12}/urwid/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.10'
-__version_tuple__ = version_tuple = (2, 6, 10)
+__version__ = version = '2.6.12'
+__version_tuple__ = version_tuple = (2, 6, 12)

{urwid-2.6.10 → urwid-2.6.12}/urwid/widget/bar_graph.py

@@ -380,7 +380,7 @@ class BarGraph(Widget, metaclass=BarGraphMeta):
                 row_combine_last(count, row)
                 y_count -= count  # noqa: PLW2901
                 r += count
-                r = r % 8
+                r %= 8
                 if not y_count:
                     continue
             if r != 0:
@@ -508,7 +508,7 @@ def calculate_bargraph_display(bardata, top: float, bar_widths: list[int], maxro
 
     for r in rows:
         if r is None:
-            y_count = y_count + 1
+            y_count += 1
             continue
         if y_count:
             rowsets.append((y_count, last))

{urwid-2.6.10 → urwid-2.6.12}/urwid/widget/monitored_list.py

@@ -24,9 +24,9 @@ import typing
 import warnings
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Callable, Collection, Iterator
+    from collections.abc import Callable, Collection, Iterable, Iterator
 
-    from typing_extensions import Concatenate, ParamSpec
+    from typing_extensions import Concatenate, ParamSpec, Self
 
     ArgSpec = ParamSpec("ArgSpec")
     Ret = typing.TypeVar("Ret")
@@ -88,23 +88,69 @@ class MonitoredList(typing.List[_T], typing.Generic[_T]):
         for item in self:
             yield None, item
 
-    __add__ = _call_modified(list.__add__)  # type: ignore[assignment]  # magic like old __super__
-    __delitem__ = _call_modified(list.__delitem__)  # type: ignore[assignment]  # magic like old __super__
-
-    __iadd__ = _call_modified(list.__iadd__)  # type: ignore[assignment]  # magic like old __super__
-    __imul__ = _call_modified(list.__imul__)  # type: ignore[assignment]  # magic like old __super__
-    __rmul__ = _call_modified(list.__rmul__)  # type: ignore[assignment]  # magic like old __super__
-    __setitem__ = _call_modified(list.__setitem__)  # type: ignore[assignment]  # magic like old __super__
-
-    append = _call_modified(list.append)  # type: ignore[assignment]  # magic like old __super__
-    extend = _call_modified(list.extend)  # type: ignore[assignment]  # magic like old __super__
-    insert = _call_modified(list.insert)  # type: ignore[assignment]  # magic like old __super__
-    pop = _call_modified(list.pop)  # type: ignore[assignment]  # magic like old __super__
-    remove = _call_modified(list.remove)  # type: ignore[assignment]  # magic like old __super__
-    reverse = _call_modified(list.reverse)  # type: ignore[assignment]  # magic like old __super__
-    sort = _call_modified(list.sort)  # type: ignore[assignment]  # magic like old __super__
-    if hasattr(list, "clear"):
-        clear = _call_modified(list.clear)  # type: ignore[assignment]  # magic like old __super__
+    @_call_modified
+    def __add__(self, __value: list[_T]) -> Self:
+        return super().__add__(__value)
+
+    @_call_modified
+    def __delitem__(self, __key: typing.SupportsIndex | slice) -> None:
+        super().__delitem__(__key)
+
+    @_call_modified
+    def __iadd__(self, __value: Iterable[_T]) -> Self:
+        return super().__iadd__(__value)
+
+    @_call_modified
+    def __rmul__(self, __value: typing.SupportsIndex) -> Self:
+        return super().__rmul__(__value)
+
+    @_call_modified
+    def __imul__(self, __value: typing.SupportsIndex) -> Self:
+        return super().__imul__(__value)
+
+    @typing.overload
+    @_call_modified
+    def __setitem__(self, __key: typing.SupportsIndex, __value: _T) -> None: ...
+
+    @typing.overload
+    @_call_modified
+    def __setitem__(self, __key: slice, __value: Iterable[_T]) -> None: ...
+
+    @_call_modified
+    def __setitem__(self, __key: typing.SupportsIndex | slice, __value: _T | Iterable[_T]) -> None:
+        super().__setitem__(__key, __value)
+
+    @_call_modified
+    def append(self, __object: _T) -> None:
+        super().append(__object)
+
+    @_call_modified
+    def extend(self, __iterable: Iterable[_T]) -> None:
+        super().extend(__iterable)
+
+    @_call_modified
+    def pop(self, __index: typing.SupportsIndex = -1) -> _T:
+        return super().pop(__index)
+
+    @_call_modified
+    def insert(self, __index: typing.SupportsIndex, __object: _T) -> None:
+        super().insert(__index, __object)
+
+    @_call_modified
+    def remove(self, __value: _T) -> None:
+        super().remove(__value)
+
+    @_call_modified
+    def reverse(self) -> None:
+        super().reverse()
+
+    @_call_modified
+    def sort(self, *, key: Callable[[_T], typing.Any] | None = None, reverse: bool = False) -> None:
+        super().sort(key=key, reverse=reverse)
+
+    @_call_modified
+    def clear(self) -> None:
+        super().clear()
 
 
 class MonitoredFocusList(MonitoredList[_T], typing.Generic[_T]):

{urwid-2.6.10 → urwid-2.6.12}/urwid/widget/padding.py

@@ -40,12 +40,14 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
         self,
         w: WrappedWidget,
         align: (
-            Literal["left", "center", "right"] | Align | tuple[Literal["relative", WHSettings.RELATIVE], int]
+            Literal["left", "center", "right"]
+            | Align
+            | tuple[Literal["relative", WHSettings.RELATIVE, "fixed left", "fixed right"], int]
         ) = Align.LEFT,
         width: (
             int
             | Literal["pack", "clip", WHSettings.PACK, WHSettings.CLIP]
-            | tuple[Literal["relative", WHSettings.RELATIVE], int]
+            | tuple[Literal["relative", WHSettings.RELATIVE, "fixed left", "fixed right"], int]
         ) = RELATIVE_100,
         min_width: int | None = None,
         left: int = 0,

{urwid-2.6.10 → urwid-2.6.12}/urwid/widget/popup.py

@@ -24,7 +24,7 @@ import typing
 
 from urwid.canvas import CompositeCanvas
 
-from .constants import Sizing
+from .constants import Align, Sizing, VAlign
 from .overlay import Overlay
 from .widget import delegate_to_widget_mixin
 from .widget_decoration import WidgetDecoration
@@ -86,8 +86,7 @@ class PopUpLauncher(delegate_to_widget_mixin("_original_widget"), WidgetDecorati
 
 
 class PopUpTarget(WidgetDecoration[WrappedWidget]):
-    # FIXME: this whole class is a terrible hack and must be fixed
-    # when layout and rendering are separated
+    # FIXME: this whole class is a terrible hack and must be fixed when layout and rendering are separated
     _sizing = frozenset((Sizing.BOX,))
     _selectable = True
 
@@ -105,19 +104,23 @@ class PopUpTarget(WidgetDecoration[WrappedWidget]):
             if self._pop_up != w:
                 self._pop_up = w
                 self._current_widget = Overlay(
-                    w,
-                    self._original_widget,
-                    ("fixed left", left),
-                    overlay_width,
-                    ("fixed top", top),
-                    overlay_height,
+                    top_w=w,
+                    bottom_w=self._original_widget,
+                    align=Align.LEFT,
+                    width=overlay_width,
+                    valign=VAlign.TOP,
+                    height=overlay_height,
+                    left=left,
+                    top=top,
                 )
             else:
                 self._current_widget.set_overlay_parameters(
-                    ("fixed left", left),
-                    overlay_width,
-                    ("fixed top", top),
-                    overlay_height,
+                    align=Align.LEFT,
+                    width=overlay_width,
+                    valign=VAlign.TOP,
+                    height=overlay_height,
+                    left=left,
+                    top=top,
                 )
         else:
             self._pop_up = None