urwid 2.6.11__tar.gz → 2.6.12__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.11
+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.11 → 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.11 → 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.11 → 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.12/ruff-requirements.txt

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

{urwid-2.6.11 → 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.11 → 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.11 → 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.11 → 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.11'
-__version_tuple__ = version_tuple = (2, 6, 11)
+__version__ = version = '2.6.12'
+__version_tuple__ = version_tuple = (2, 6, 12)

{urwid-2.6.11 → 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.11 → urwid-2.6.12}/urwid/widget/scrollable.py

@@ -137,6 +137,17 @@ class SupportsRelativeScroll(WidgetProto, Protocol):
     def get_visible_amount(self, size: tuple[int, int], focus: bool = False) -> int: ...
 
 
+def orig_iter(w: Widget) -> Iterator[Widget]:
+    visited = {w}
+    yield w
+    while hasattr(w, "original_widget"):
+        w = w.original_widget
+        if w in visited:
+            break
+        visited.add(w)
+        yield w
+
+
 class Scrollable(WidgetDecoration[WrappedWidget]):
     def sizing(self) -> frozenset[Sizing]:
         return frozenset((Sizing.BOX,))
@@ -481,7 +492,8 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
         """
         if Sizing.BOX not in widget.sizing():
             raise ValueError(f"Not a box widget: {widget!r}")
-        if not isinstance(widget, SupportsScroll):
+
+        if not any(isinstance(w, SupportsScroll) for w in orig_iter(widget)):
             raise TypeError(f"Not a scrollable widget: {widget!r}")
 
         super().__init__(widget)
@@ -612,12 +624,6 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
     def scrolling_base_widget(self) -> SupportsScroll | SupportsRelativeScroll:
         """Nearest `original_widget` that is compatible with the scrolling API"""
 
-        def orig_iter(w: Widget) -> Iterator[Widget]:
-            while hasattr(w, "original_widget"):
-                w = w.original_widget
-                yield w
-            yield w
-
         w = self
 
         for w in orig_iter(self):

{urwid-2.6.11 → urwid-2.6.12}/urwid/widget/widget_decoration.py

@@ -105,9 +105,13 @@ class WidgetDecoration(Widget, typing.Generic[WrappedWidget]):  # pylint: disabl
         >>> wd3.base_widget is t
         True
         """
+        visited = {self}
         w = self
         while hasattr(w, "_original_widget"):
             w = w._original_widget
+            if w in visited:
+                break
+            visited.add(w)
         return w
 
     def _get_base_widget(self) -> Widget:

{urwid-2.6.11 → urwid-2.6.12}/urwid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.11
+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.11/black-requirements.txt

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

urwid-2.6.11/ruff-requirements.txt

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