urwid 4.2.2__tar.gz → 4.2.4__tar.gz

{urwid-4.2.2/urwid.egg-info → urwid-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 4.2.2
+Version: 4.2.4
 Summary: A full-featured console (xterm et al.) user interface library
 Author-email: Ian Ward <ian@excess.org>
 License-Expression: LGPL-2.1-only

{urwid-4.2.2 → urwid-4.2.4}/urwid/version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '4.2.2'
-__version_tuple__ = version_tuple = (4, 2, 2)
+__version__ = version = '4.2.4'
+__version_tuple__ = version_tuple = (4, 2, 4)
 
-__commit_id__ = commit_id = 'gd131ddace'
+__commit_id__ = commit_id = 'gb84a230c2'

{urwid-4.2.2 → urwid-4.2.4}/urwid/widget/columns.py

@@ -275,7 +275,6 @@ class Columns(
         *box_columns* will be displayed with this calculated number of rows,
         filling the full height.
         """
-        self._selectable = False
         self._cache_column_widths: list[int] = []
         self._cache_pack_widths: dict[int, int] = {}
         super().__init__()
@@ -401,10 +400,17 @@ class Columns(
         return len(self._contents)
 
     def _contents_modified(self) -> None:
-        """Recalculate whether this widget should be selectable whenever the contents has been changed."""
-        self._selectable = any(w.selectable() for w, o in self.contents)
+        """Invalidate this widget whenever the contents has been changed."""
         self._invalidate()
 
+    def selectable(self) -> bool:
+        """Return whether any child widget is selectable.
+
+        Asked on every call rather than cached,
+        since a child such as :class:`~urwid.WidgetPlaceholder` may change its selectability after it was added.
+        """
+        return any(w.selectable() for w, _ in self.contents)
+
     def _validate_contents_modified(
         self,
         slc: tuple[int, int, int],

{urwid-4.2.2 → urwid-4.2.4}/urwid/widget/grid_flow.py

@@ -475,9 +475,6 @@ class GridFlow(
         if self.v_sep:
             # remove first divider
             del p.contents[:1]
-        else:
-            # Ensure p __selectable is updated
-            p._contents_modified()  # pylint: disable=protected-access
 
         return p
 

{urwid-4.2.2 → urwid-4.2.4}/urwid/widget/listbox.py

@@ -900,7 +900,14 @@ class ListBox(Widget, WidgetContainerMixin[_K]):
             raise TypeError(f"{type(self._body)}.set_focus is not implemented.")
 
         # restore old focus temporarily
-        self._body.set_focus(focus_pos)
+        try:
+            self._body.set_focus(focus_pos)
+        except (IndexError, KeyError):
+            # A focus that did move means a "modified" signal callback raised, not that the position is gone.
+            if self._body.get_focus()[1] != position:
+                raise
+            # The body lost the old focus position after ListBox.set_focus().
+            # The walker still focuses the new position, and the placement below starts from it.
 
         middle, top, bottom = self.calculate_visible((maxcol, maxrow), focus)
         if middle is None or top is None or bottom is None:

{urwid-4.2.2 → urwid-4.2.4}/urwid/widget/pile.py

@@ -223,7 +223,6 @@ class Pile(
         .. note:: If the Pile is treated as a box widget there must be at least
             one ``'weight'`` tuple in :attr:`widget_list`.
         """
-        self._selectable = False
         super().__init__()
         self._contents: MonitoredFocusList[
             tuple[
@@ -344,10 +343,17 @@ class Pile(
         return len(self._contents)
 
     def _contents_modified(self) -> None:
-        """Recalculate whether this widget should be selectable whenever the contents has been changed."""
-        self._selectable = any(w.selectable() for w, o in self.contents)
+        """Invalidate this widget whenever the contents has been changed."""
         self._invalidate()
 
+    def selectable(self) -> bool:
+        """Return whether any child widget is selectable.
+
+        Asked on every call rather than cached,
+        since a child such as :class:`~urwid.WidgetPlaceholder` may change its selectability after it was added.
+        """
+        return any(w.selectable() for w, _ in self.contents)
+
     def _validate_contents_modified(
         self,
         slc: tuple[int, int, int],

{urwid-4.2.2 → urwid-4.2.4}/urwid/widget/text.py

@@ -316,6 +316,17 @@ class Text(Widget):
         """Return the number of screen columns and rows required for this Text widget.
 
         The widget is expected to be displayed without wrapping or clipping, as a single element tuple.
+        With *maxcol* the size is taken from the layout at that width.
+        Without it the width is searched for::
+
+            maxcol = text width + 1, with StandardTextLayout tabs at their widest
+                |
+                v
+            lay out at maxcol --> layout has pack()? --no--> widest line, line count
+                ^                        |
+                |                       yes
+                |                        v
+            double maxcol <--no-- layout.pack() < maxcol? --yes--> pack() columns, line count
 
         :param size: ``None`` or ``()`` for unlimited screen columns (like FIXED sizing)
                      or (*maxcol*,) to specify a maximum column size
@@ -354,12 +365,19 @@ class Text(Widget):
             cols = self.layout.pack(maxcol, trans)
             return (cols, len(trans))
 
-        # no line is wider than the whole text, except when tabs (counted here as 0 columns) push it further
+        layout = self.layout
+        # No line is wider than the whole text with every tab taking the widest gap between tab stops.
+        # A custom layout may still widen a line.
         maxcol = calc_width(text, 0, len(text)) + 1
+        tabs = text.count("\t") if isinstance(text, str) else text.count(b"\t")
+        if tabs and isinstance(layout, text_layout.StandardTextLayout):
+            stops = (0, *layout.tab_stops)
+            widest_tab = max((layout.tab_stop_every, *(end - start for start, end in zip(stops, stops[1:]))))
+            maxcol += widest_tab * tabs
         while True:
-            trans = self.layout.layout(text, maxcol, self._align_mode, self._wrap_mode)
-            if not hasattr(self.layout, "pack"):
+            trans = layout.layout(text, maxcol, self._align_mode, self._wrap_mode)
+            if not hasattr(layout, "pack"):
                 return max(text_layout.line_width(line) for line in trans), len(trans)
-            if (cols := self.layout.pack(maxcol, trans)) < maxcol:
+            if (cols := layout.pack(maxcol, trans)) < maxcol:
                 return cols, len(trans)
             maxcol *= 2

{urwid-4.2.2 → urwid-4.2.4/urwid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 4.2.2
+Version: 4.2.4
 Summary: A full-featured console (xterm et al.) user interface library
 Author-email: Ian Ward <ian@excess.org>
 License-Expression: LGPL-2.1-only

urwid-4.2.4/urwid.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "4.2.4",
+  "distance": 0,
+  "node": "gb84a230c2b7d3de4a96480668002c34db0ff6e95",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-01"
+}

urwid-4.2.2/urwid.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "4.2.2",
-  "distance": 0,
-  "node": "gd131ddacee0bce743eefcb49d6d0ee2873ae3f6e",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-30"
-}