urwid 2.6.12__tar.gz → 2.6.14__tar.gz

{urwid-2.6.12 → urwid-2.6.14}/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,10 @@
 ##### Checklist
 - [ ] I've ensured that similar functionality has not already been implemented
 - [ ] I've ensured that similar functionality has not earlier been proposed and declined
-- [ ] I've branched off the `master` or `python-dual-support` branch
+- [ ] I've branched off the `master` branch
 - [ ] I've merged fresh upstream into my branch recently
 - [ ] I've ran `tox` successfully in local environment
 - [ ] I've included docstrings and/or documentation and/or examples for my code (if this is a new feature)
 
 ##### Description:
 *(P. S. If this pull requests fixes an existing issue, please specify which one.)*
-

{urwid-2.6.12 → urwid-2.6.14}/.github/workflows/isolated_static_check.yml

@@ -88,4 +88,4 @@ jobs:
       - name: Install package for test
         run: pip install -e .
       - name: Lint with pylint
-        run: pylint urwid
+        run: pylint --output-format=github urwid

{urwid-2.6.12 → urwid-2.6.14}/.github/workflows/pythonpackage.yml

@@ -103,7 +103,7 @@ jobs:
       - name: Install package for test
         run: pip install -e .
       - name: Lint with pylint
-        run: pylint urwid
+        run: pylint --output-format=github urwid
 
   Test:
     needs: [ Isort, Black, Ruff, PyLint ]

{urwid-2.6.12 → urwid-2.6.14}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
@@ -20,13 +20,13 @@ repos:
         types: [pyi]
 
   - repo: https://github.com/psf/black
-    rev: 24.2.0
+    rev: 24.4.2
     hooks:
       - id: black
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.3.2
+    rev: v0.4.7
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix ]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.12
+Version: 2.6.14
 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 → urwid-2.6.14}/docs/examples/real_browse.py

@@ -82,11 +82,11 @@ class FlagFileWidget(urwid.TreeWidget):
     def update_w(self) -> None:
         """Update the attributes of self.widget based on self.flagged."""
         if self.flagged:
-            self._w.attr = "flagged"
-            self._w.focus_attr = "flagged focus"
+            self._w.attr_map = {None: "flagged"}
+            self._w.focus_map = {None: "flagged focus"}
         else:
-            self._w.attr = "body"
-            self._w.focus_attr = "focus"
+            self._w.attr_map = {None: "body"}
+            self._w.focus_map = {None: "focus"}
 
 
 class FileTreeWidget(FlagFileWidget):

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

@@ -82,11 +82,11 @@ class FlagFileWidget(urwid.TreeWidget):
     def update_w(self) -> None:
         """Update the attributes of self.widget based on self.flagged."""
         if self.flagged:
-            self._w.attr = "flagged"
-            self._w.focus_attr = "flagged focus"
+            self._w.attr_map = {None: "flagged"}
+            self._w.focus_map = {None: "flagged focus"}
         else:
-            self._w.attr = "body"
-            self._w.focus_attr = "focus"
+            self._w.attr_map = {None: "body"}
+            self._w.focus_map = {None: "focus"}
 
 
 class FileTreeWidget(FlagFileWidget):

urwid-2.6.14/pylint-requirements.txt

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

{urwid-2.6.12 → urwid-2.6.14}/pyproject.toml

@@ -158,7 +158,6 @@ target-version = "py37"
 extend-exclude = ["tests"]
 
 [tool.ruff.lint]
-ignore-init-module-imports = true
 extend-select = [
   "E",
   "W",  # also pycodestyle warnings

urwid-2.6.14/ruff-requirements.txt

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

{urwid-2.6.12 → urwid-2.6.14}/test_requirements.txt

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

{urwid-2.6.12 → urwid-2.6.14}/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.12 → urwid-2.6.14}/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,11 +283,11 @@ 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)
 
@@ -401,11 +401,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 +479,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 +518,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.12 → urwid-2.6.14}/urwid/display/_raw_display_base.py

@@ -682,7 +682,7 @@ class Screen(BaseScreen, RealTerminal):
                 if isinstance(inserttext, bytes):
                     inserttext = inserttext.decode(encoding)
 
-                output.extend(("\x08" * back, ias))
+                output.extend(("\x08" * back, ias))  # pylint: disable=used-before-assignment  # defined in `if row`
 
                 if encoding != "utf-8":
                     if cs is None:

{urwid-2.6.12 → urwid-2.6.14}/urwid/display/common.py

@@ -39,9 +39,6 @@ if typing.TYPE_CHECKING:
 
 IS_WINDOWS = sys.platform == "win32"
 
-if not IS_WINDOWS:
-    import termios
-
 # for replacing unprintable bytes with '?'
 UNPRINTABLE_TRANS_TABLE = b"?" * 32 + bytes(range(32, 256))
 
@@ -941,6 +938,8 @@ class RealTerminal:
             is called.
             """
 
+            import termios
+
             if fileno is None:
                 fileno = sys.stdin.fileno()
             if not os.isatty(fileno):

{urwid-2.6.12 → urwid-2.6.14}/urwid/display/curses.py

@@ -62,7 +62,7 @@ if IS_WINDOWS:
     )
 
     def initscr():
-        import curses  # pylint: disable=redefined-outer-name,reimported  # special case for monkeypatch
+        import curses  # noqa: I001  # pylint: disable=redefined-outer-name,reimported  # special case for monkeypatch
 
         import _curses
 
@@ -666,7 +666,7 @@ class _test:
             r.text = ([t.ljust(cols) for t in text] + [""] * rows)[:rows]
             r.attr = (attr + [[] for _ in range(rows)])[:rows]
             self.ui.draw_screen((cols, rows), r)
-            keys, raw = self.ui.get_input(raw_keys=True)  # pylint: disable=unpacking-non-sequence
+            keys, raw = self.ui.get_input(raw_keys=True)
             if "window resize" in keys:
                 cols, rows = self.ui.get_cols_rows()
             if not keys:

{urwid-2.6.12 → urwid-2.6.14}/urwid/event_loop/trio_loop.py

@@ -26,13 +26,16 @@ Trio library is required.
 from __future__ import annotations
 
 import logging
+import sys
 import typing
 
-import exceptiongroup
 import trio
 
 from .abstract_loop import EventLoop, ExitMainLoop
 
+if sys.version_info < (3, 11):
+    from exceptiongroup import BaseExceptionGroup  # pylint: disable=redefined-builtin  # backport
+
 if typing.TYPE_CHECKING:
     import io
     from collections.abc import Awaitable, Callable, Hashable, Mapping
@@ -156,8 +159,10 @@ class TrioEventLoop(EventLoop):
 
         emulate_idle_callbacks = _TrioIdleCallbackInstrument(self._idle_callbacks)
 
-        with exceptiongroup.catch({BaseException: self._handle_main_loop_exception}):
+        try:
             trio.run(self._main_task, instruments=[emulate_idle_callbacks])
+        except BaseException as exc:
+            self._handle_main_loop_exception(exc)
 
     async def run_async(self) -> None:
         """Starts the main loop and blocks asynchronously until the main loop exits.
@@ -179,12 +184,14 @@ class TrioEventLoop(EventLoop):
 
         emulate_idle_callbacks = _TrioIdleCallbackInstrument(self._idle_callbacks)
 
-        with exceptiongroup.catch({BaseException: self._handle_main_loop_exception}):
+        try:
             trio.lowlevel.add_instrument(emulate_idle_callbacks)
             try:
                 await self._main_task()
             finally:
                 trio.lowlevel.remove_instrument(emulate_idle_callbacks)
+        except BaseException as exc:
+            self._handle_main_loop_exception(exc)
 
     def watch_file(
         self,
@@ -225,12 +232,11 @@ class TrioEventLoop(EventLoop):
         """Handles exceptions raised from the main loop, catching ExitMainLoop
         instead of letting it propagate through.
 
-        Note that since Trio may collect multiple exceptions from tasks into a
-        Trio MultiError, we cannot simply use a try..catch clause, we need a
-        helper function like this.
+        Note that since Trio may collect multiple exceptions from tasks into an ExceptionGroup,
+        we cannot simply use a try..catch clause, we need a helper function like this.
         """
         self._idle_callbacks.clear()
-        if isinstance(exc, exceptiongroup.BaseExceptionGroup) and len(exc.exceptions) == 1:
+        if isinstance(exc, BaseExceptionGroup) and len(exc.exceptions) == 1:
             exc = exc.exceptions[0]
 
         if isinstance(exc, ExitMainLoop):

{urwid-2.6.12 → urwid-2.6.14}/urwid/event_loop/zmq_loop.py

@@ -250,17 +250,17 @@ class ZMQEventLoop(EventLoop):
         """
         A single iteration of the event loop.
         """
+        state = "wait"  # default state not expecting any action
         if self._alarms or self._did_something:
             timeout = 0
             if self._alarms:
                 state = "alarm"
-                timeout = max(0, self._alarms[0][0] - time.time())
+                timeout = max(0.0, self._alarms[0][0] - time.time())
             if self._did_something and (not self._alarms or (self._alarms and timeout > 0)):
                 state = "idle"
                 timeout = 0
             ready = dict(self._poller.poll(timeout * 1000))
         else:
-            state = "wait"
             ready = dict(self._poller.poll())
 
         if not ready:

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

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

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

@@ -564,10 +564,10 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
             thumb_weight = min(1.0, maxrow / max(1, ow_rows_max))
 
         # Thumb shrinks/grows according to the ratio of <number of visible lines> / <number of total lines>
-        thumb_height = max(1, round(thumb_weight * maxrow))
+        thumb_height = max(1, round(thumb_weight * maxrow))  # pylint: disable=possibly-used-before-assignment
 
         # Thumb may only touch top/bottom if the first/last row is visible
-        top_weight = float(pos) / max(1, posmax)
+        top_weight = float(pos) / max(1, posmax)  # pylint: disable=possibly-used-before-assignment
         top_height = int((maxrow - thumb_height) * top_weight)
         if top_height == 0 and top_weight > 0:
             top_height = 1
@@ -591,7 +591,10 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
             ),
         )
 
-        combinelist = [(ow_canv, None, True, ow_size[0]), (sb_canv, None, False, sb_width)]
+        combinelist = [
+            (ow_canv, None, True, ow_size[0]),  # pylint: disable=possibly-used-before-assignment
+            (sb_canv, None, False, sb_width),
+        ]
 
         if self._scrollbar_side != SCROLLBAR_LEFT:
             return canvas.CanvasJoin(combinelist)
@@ -665,4 +668,4 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
                 ow.set_scrollpos(pos + 1)
                 return True
 
-        return False
+        return handled

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

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

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

urwid-2.6.12/ruff-requirements.txt

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