urwid 4.2.0__tar.gz → 4.2.1__tar.gz

{urwid-4.2.0/urwid.egg-info → urwid-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 4.2.0
+Version: 4.2.1
 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.0 → urwid-4.2.1}/urwid/canvas.py

@@ -535,7 +535,10 @@ class TextCanvas(Canvas):
         if not rows:
             rows = maxrow - trim_top
 
-        if not ((0 <= trim_left < maxcol) and (cols > 0 and trim_left + cols <= maxcol)):
+        # a canvas without columns (empty text) has one region only: all of it, zero columns wide
+        if not (
+            (0 <= trim_left < maxcol and cols > 0 and trim_left + cols <= maxcol) or maxcol == trim_left == cols == 0
+        ):
             raise ValueError(trim_left)
         if not ((0 <= trim_top < maxrow) and (rows > 0 and trim_top + rows <= maxrow)):
             raise ValueError(trim_top)

{urwid-4.2.0 → urwid-4.2.1}/urwid/text_layout.py

@@ -121,26 +121,33 @@ class StandardTextLayout(TextLayout):
         A tab character advances to the next tab stop, measured in rendered screen columns
         from the start of the displayed line: explicit *tab_stops* are used first,
         then stops repeat every *tab_stop_every* columns counted from column 0.
+        With *tab_stop_every* ``0`` a tab past the last explicit stop takes no columns.
 
         :param tab_stops: screen columns of explicit tab stops.
-        :param tab_stop_every: interval of the default tab stops.
-        :raises ValueError: *tab_stop_every* or one of *tab_stops* is not a positive column.
+        :param tab_stop_every: interval of the default tab stops, ``0`` for none.
+        :raises ValueError: *tab_stop_every* is negative, or one of *tab_stops* is not a positive column.
         """
         self.tab_stops: tuple[int, ...] = tuple(sorted(set(tab_stops)))
-        if tab_stop_every < 1 or (self.tab_stops and self.tab_stops[0] < 1):
+        if tab_stop_every < 0 or (self.tab_stops and self.tab_stops[0] < 1):
             raise ValueError(f"Tab stops must be positive: {tab_stops=!r}, {tab_stop_every=!r}")
         self.tab_stop_every = tab_stop_every
 
     def next_tab_stop(self, column: int) -> int:
         """Return the screen column of the first tab stop after *column*.
 
+        When there is no stop after *column*, return *column* itself: the tab takes no columns.
+
         >>> StandardTextLayout(tab_stops=(4, 10)).next_tab_stop(5)
         10
         >>> StandardTextLayout(tab_stops=(4, 10)).next_tab_stop(10)
         16
+        >>> StandardTextLayout(tab_stops=(4, 10), tab_stop_every=0).next_tab_stop(10)
+        10
         """
         if (idx := bisect.bisect_right(self.tab_stops, column)) < len(self.tab_stops):
             return self.tab_stops[idx]
+        if not self.tab_stop_every:
+            return column
         return (column // self.tab_stop_every + 1) * self.tab_stop_every
 
     def supports_align_mode(self, align: Literal["left", "center", "right"] | Align) -> bool:
@@ -305,7 +312,10 @@ class StandardTextLayout(TextLayout):
         pos = start
         while pos < end:
             if text[pos : pos + 1] == tab:
-                tab_width = self.next_tab_stop(column) - column
+                if not (tab_width := self.next_tab_stop(column) - column):
+                    line.append((0, pos))
+                    pos += 1
+                    continue
                 if limit is not None and column + tab_width > limit:
                     if limit > column:
                         line.append((limit - column, pos, b" " * (limit - column)))
@@ -355,7 +365,10 @@ class StandardTextLayout(TextLayout):
         pos = start
         while pos < end:
             if text[pos : pos + 1] == tab:
-                if column < width:
+                if self.next_tab_stop(column) == column:
+                    line.append((0, pos))
+                    pos += 1
+                elif column < width:
                     tab_width = min(self.next_tab_stop(column), width) - column
                     line.append((tab_width, pos, b" " * tab_width))
                     column += tab_width

{urwid-4.2.0 → urwid-4.2.1}/urwid/version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '4.2.0'
-__version_tuple__ = version_tuple = (4, 2, 0)
+__version__ = version = '4.2.1'
+__version_tuple__ = version_tuple = (4, 2, 1)
 
-__commit_id__ = commit_id = 'g15c2c59b0'
+__commit_id__ = commit_id = 'gf0dabd13b'

{urwid-4.2.0 → urwid-4.2.1}/urwid/widget/edit.py

@@ -487,7 +487,8 @@ class Edit(WidgetWrap[Text]):
                 if idx:
                     column = layout.next_tab_stop(column)
                 column += calc_width(chunk, 0, len(chunk))
-            self.insert_text(" " * (layout.next_tab_stop(column) - column))
+            if spaces := layout.next_tab_stop(column) - column:
+                self.insert_text(" " * spaces)
             return None
 
         if key == "enter" and self.multiline:

{urwid-4.2.0 → urwid-4.2.1/urwid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 4.2.0
+Version: 4.2.1
 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.0 → urwid-4.2.1}/urwid.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "4.2.0",
+  "tag": "4.2.1",
   "distance": 0,
-  "node": "g15c2c59b010d1ffe65453e7ded5dd05fae5ae6ab",
+  "node": "gf0dabd13b6489029422d8d7883f60e98215d811f",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-09-29"