urwid 2.6.13__tar.gz → 2.6.15__tar.gz

{urwid-2.6.13 → urwid-2.6.15}/.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.4.7
+    rev: v0.5.0
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix ]

{urwid-2.6.13 → urwid-2.6.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.13
+Version: 2.6.15
 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.13 → urwid-2.6.15}/docs/examples/subproc.py

@@ -34,8 +34,8 @@ def received_output(data: bytes) -> bool:
 
 
 write_fd = loop.watch_pipe(received_output)
-with subprocess.Popen(
-    ["python", "-u", run_me, str(factor_me)],  # noqa: S603,S607  # Example can be insecure
+with subprocess.Popen(  # noqa: S603
+    ["python", "-u", run_me, str(factor_me)],  # noqa: S607  # Example can be insecure
     stdout=write_fd,
     close_fds=True,
 ) as proc:

{urwid-2.6.13 → urwid-2.6.15}/examples/subproc.py

@@ -34,8 +34,8 @@ def received_output(data: bytes) -> bool:
 
 
 write_fd = loop.watch_pipe(received_output)
-with subprocess.Popen(
-    ["python", "-u", run_me, str(factor_me)],  # noqa: S603,S607  # Example can be insecure
+with subprocess.Popen(  # noqa: S603
+    ["python", "-u", run_me, str(factor_me)],  # noqa: S607  # Example can be insecure
     stdout=write_fd,
     close_fds=True,
 ) as proc:

urwid-2.6.15/pylint-requirements.txt

@@ -0,0 +1 @@
+pylint==3.2.5

urwid-2.6.15/ruff-requirements.txt

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

{urwid-2.6.13 → urwid-2.6.15}/test_requirements.txt

@@ -2,7 +2,7 @@ tornado>=5
 twisted
 trio
 zmq
-exceptiongroups;python_version<'3.11'
+exceptiongroup;python_version<'3.11'
 windows-curses;sys_platform=="win32"
 pyserial
 # for test run

{urwid-2.6.13 → urwid-2.6.15}/tests/test_grid_flow.py

@@ -204,3 +204,27 @@ class GridFlowTest(unittest.TestCase):
         gf.set_focus(t1)
         self.assertEqual(gf.focus_position, 0)
         self.assertRaises(ValueError, lambda: gf.set_focus("nonexistant"))
+
+    def test_empty(self):
+        """Test behaviour of empty widget."""
+        grid = urwid.GridFlow(
+            (),
+            cell_width=10,
+            h_sep=1,
+            v_sep=1,
+            align=urwid.CENTER,
+        )
+        self.assertEqual(frozenset((urwid.FLOW,)), grid.sizing(), "Empty grid can not be handled as FIXED")
+        rows = 1
+        with self.subTest("Flow"):
+            maxcol = 1
+            self.assertEqual((maxcol, rows), grid.pack((maxcol,)))
+            rendered = grid.render((maxcol,))
+            self.assertEqual(maxcol, rendered.cols())
+            self.assertEqual(rows, rendered.rows())
+
+        with self.subTest("Fixed"):
+            maxcol = 0
+            self.assertEqual((maxcol, rows), grid.pack(()))
+            with self.assertRaises(ValueError):
+                grid.render(())

{urwid-2.6.13 → urwid-2.6.15}/tests/test_scrollable.py

@@ -133,11 +133,11 @@ class TestScrollBarScrollable(unittest.TestCase):
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
-        widget.mouse_event(reduced_size, "mouse press", 5, 1, 1, False)
+        self.assertTrue(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.assertTrue(widget.mouse_event(reduced_size, "mouse press", 4, 1, 1, False))
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
@@ -283,14 +283,29 @@ class TestScrollBarListBox(unittest.TestCase):
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
-        widget.mouse_event(reduced_size, "mouse press", 5, 1, 1, False)
+        self.assertTrue(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.assertTrue(widget.mouse_event(reduced_size, "mouse press", 4, 1, 1, False))
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
+    def test_empty(self):
+        """Empty widget should be correctly rendered."""
+        widget = urwid.ScrollBar(urwid.ListBox(urwid.SimpleListWalker(())))
+        reduced_size = (10, 5)
+        self.assertEqual(
+            (
+                "          ",
+                "          ",
+                "          ",
+                "          ",
+                "          ",
+            ),
+            widget.render(reduced_size).decoded_text,
+        )
+
 
 def trivial_AttrMap(widget):
     return urwid.AttrMap(widget, {})
@@ -401,11 +416,11 @@ class TestScrollBarAttrMap(unittest.TestCase):
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
-        widget.mouse_event(reduced_size, "mouse press", 5, 1, 1, False)
+        self.assertTrue(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.assertTrue(widget.mouse_event(reduced_size, "mouse press", 4, 1, 1, False))
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
@@ -479,11 +494,11 @@ class TestScrollBarListBoxAttrMap(unittest.TestCase):
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
-        widget.mouse_event(reduced_size, "mouse press", 5, 1, 1, False)
+        self.assertTrue(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.assertTrue(widget.mouse_event(reduced_size, "mouse press", 4, 1, 1, False))
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
@@ -518,11 +533,11 @@ class TestScrollBarListBoxAttrMap(unittest.TestCase):
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 
-        widget.mouse_event(reduced_size, "mouse press", 5, 1, 1, False)
+        self.assertTrue(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.assertTrue(widget.mouse_event(reduced_size, "mouse press", 4, 1, 1, False))
 
         self.assertEqual(top_position_rendered, widget.render(reduced_size).decoded_text)
 

{urwid-2.6.13 → urwid-2.6.15}/urwid/display/_posix_raw_display.py

@@ -148,8 +148,8 @@ class Screen(_raw_display_base.Screen):
         if not os.environ.get("TERM", "").lower().startswith("linux"):
             return
 
-        m = Popen(  # pylint: disable=consider-using-with
-            ["/usr/bin/mev", "-e", "158"],  # noqa: S603
+        m = Popen(  # noqa: S603  # pylint: disable=consider-using-with
+            ["/usr/bin/mev", "-e", "158"],
             stdin=PIPE,
             stdout=PIPE,
             close_fds=True,

{urwid-2.6.13 → urwid-2.6.15}/urwid/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.13'
-__version_tuple__ = version_tuple = (2, 6, 13)
+__version__ = version = '2.6.15'
+__version_tuple__ = version_tuple = (2, 6, 15)

{urwid-2.6.13 → urwid-2.6.15}/urwid/widget/grid_flow.py

@@ -30,13 +30,18 @@ class GridFlowWarning(WidgetWarning):
 
 class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListContentsMixin):
     """
-    The GridFlow widget is a flow widget that renders all the widgets it
-    contains the same width and it arranges them from left to right and top to
-    bottom.
+    The GridFlow widget is a flow widget that renders all the widgets it contains the same width,
+    and it arranges them from left to right and top to bottom.
     """
 
     def sizing(self) -> frozenset[Sizing]:
-        return frozenset((Sizing.FLOW, Sizing.FIXED))
+        """Widget sizing.
+
+        ..note:: Empty widget sizing is limited to the FLOW due to no data for width.
+        """
+        if self:
+            return frozenset((Sizing.FLOW, Sizing.FIXED))
+        return frozenset((Sizing.FLOW,))
 
     def __init__(
         self,
@@ -422,14 +427,16 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
     def _get_maxcol(self, size: tuple[int] | tuple[()]) -> int:
         if size:
             (maxcol,) = size
-            if maxcol < self.cell_width:
+            if self and maxcol < self.cell_width:
                 warnings.warn(
                     f"Size is smaller than cell width ({maxcol!r} < {self.cell_width!r})",
                     GridFlowWarning,
                     stacklevel=3,
                 )
-        else:
+        elif self:
             maxcol = len(self) * self.cell_width + (len(self) - 1) * self.h_sep
+        else:
+            maxcol = 0
         return maxcol
 
     def get_display_widget(self, size: tuple[int] | tuple[()]) -> Divider | Pile:
@@ -525,7 +532,7 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
 
     def keypress(
         self,
-        size: tuple[int],  # type: ignore[override]
+        size: tuple[int] | tuple[()],  # type: ignore[override]
         key: str,
     ) -> str | None:
         """
@@ -545,7 +552,10 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
     ) -> tuple[int, int]:
         if size:
             return super().pack(size, focus)
-        cols = len(self) * self.cell_width + (len(self) - 1) * self.h_sep
+        if self:
+            cols = len(self) * self.cell_width + (len(self) - 1) * self.h_sep
+        else:
+            cols = 0
         return cols, self.rows((cols,), focus)
 
     def rows(self, size: tuple[int], focus: bool = False) -> int:

{urwid-2.6.13 → urwid-2.6.15}/urwid/widget/listbox.py

@@ -645,17 +645,18 @@ class ListBox(Widget, WidgetContainerMixin):
             rows = 0
 
             focused_w, idx = self.body.get_focus()
-            rows += focused_w.rows((cols,), focus)
-
-            prev, pos = self._body.get_prev(idx)
-            while prev is not None:
-                rows += prev.rows((cols,), False)
-                prev, pos = self._body.get_prev(pos)
-
-            next_, pos = self.body.get_next(idx)
-            while next_ is not None:
-                rows += next_.rows((cols,), True)
-                next_, pos = self._body.get_next(pos)
+            if focused_w:
+                rows += focused_w.rows((cols,), focus)
+
+                prev, pos = self._body.get_prev(idx)
+                while prev is not None:
+                    rows += prev.rows((cols,), False)
+                    prev, pos = self._body.get_prev(pos)
+
+                next_, pos = self.body.get_next(idx)
+                while next_ is not None:
+                    rows += next_.rows((cols,), True)
+                    next_, pos = self._body.get_next(pos)
 
             self._rows_max_cached = rows
 

{urwid-2.6.13 → urwid-2.6.15}/urwid/widget/scrollable.py

@@ -668,4 +668,4 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
                 ow.set_scrollpos(pos + 1)
                 return True
 
-        return False
+        return handled

{urwid-2.6.13 → urwid-2.6.15}/urwid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.13
+Version: 2.6.15
 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.13/pylint-requirements.txt

@@ -1 +0,0 @@
-pylint==3.2.2

urwid-2.6.13/ruff-requirements.txt

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