urwid 4.0.2__tar.gz → 4.0.4__tar.gz

{urwid-4.0.2 → urwid-4.0.4}/.github/workflows/documentation.yml

@@ -23,7 +23,7 @@ jobs:
   Build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0  # need for setuptools_scm
       - name: Set up Python

{urwid-4.0.2 → urwid-4.0.4}/.github/workflows/isolated_static_check.yml

@@ -14,7 +14,7 @@ jobs:
     name: Validate formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -32,7 +32,7 @@ jobs:
     name: Check with Ruff
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -50,7 +50,7 @@ jobs:
     name: Check with pylint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get -qq update

{urwid-4.0.2 → urwid-4.0.4}/.github/workflows/pythonpackage.yml

@@ -30,7 +30,7 @@ jobs:
     name: Validate formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -48,7 +48,7 @@ jobs:
     name: Check with Ruff
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -66,7 +66,7 @@ jobs:
     name: Check with pylint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get -qq update
@@ -102,7 +102,7 @@ jobs:
             python-version: "3.14"
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0  # need for setuptools_scm
       - name: Set up Python ${{ matrix.python-version }}
@@ -158,7 +158,7 @@ jobs:
     needs: [ Test, Ruff-format, Ruff, PyLint ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0  # need for setuptools_scm
 
@@ -189,7 +189,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ build ]
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

{urwid-4.0.2 → urwid-4.0.4}/.github/workflows/yamllint.yml

@@ -10,7 +10,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

{urwid-4.0.2 → urwid-4.0.4}/.pre-commit-config.yaml

@@ -2,23 +2,29 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:
-      - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: mixed-line-ending
+        args: [ --fix=lf ]
+      - id: check-yaml
+      - id: check-toml
+      - id: check-json
+      - id: check-merge-conflict
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
-    rev: v0.14.5
+    rev: v0.15.18
     hooks:
-      # Run the linter.
       - id: ruff-check
-        args: [ --fix ]
-      # Run the formatter.
+        args: [ --show-fixes, --fix ]
       - id: ruff-format
 
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: v2.25.0
+    hooks:
+      - id: pyproject-fmt
+
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.37.1
+    rev: v1.38.0
     hooks:
       - id: yamllint
 

{urwid-4.0.2 → urwid-4.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 4.0.2
+Version: 4.0.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
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://urwid.org/
 Project-URL: Documentation, https://urwid.org/manual/index.html
 Project-URL: Repository, https://github.com/urwid/urwid
 Project-URL: Bug Tracker, https://github.com/urwid/urwid/issues
-Keywords: curses,ui,widget,scroll,listbox,user interface,text layout,console,ncurses
+Keywords: console,curses,listbox,ncurses,scroll,text layout,ui,user interface,widget
 Platform: unix-like
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -34,15 +34,16 @@ Requires-Python: >=3.9.0
 Description-Content-Type: text/x-rst
 License-File: COPYING
 Requires-Dist: wcwidth>=0.4
+Requires-Dist: typing-extensions
 Provides-Extra: curses
 Requires-Dist: windows-curses; sys_platform == "win32" and extra == "curses"
 Provides-Extra: glib
-Requires-Dist: PyGObject; extra == "glib"
+Requires-Dist: pygobject; extra == "glib"
 Provides-Extra: tornado
 Requires-Dist: tornado>=5.0; extra == "tornado"
 Provides-Extra: trio
-Requires-Dist: trio>=0.24.0; extra == "trio"
 Requires-Dist: exceptiongroup; python_version < "3.11" and extra == "trio"
+Requires-Dist: trio>=0.24.0; extra == "trio"
 Provides-Extra: twisted
 Requires-Dist: twisted; extra == "twisted"
 Provides-Extra: zmq

{urwid-4.0.2 → urwid-4.0.4}/docs/changelog.rst

@@ -2,6 +2,45 @@
 Changelog
 ---------
 
+Urwid 4.0.4
+===========
+
+2026-07-13
+
+New features 🗹
++++++++++++++++
+* urwid.Colmns: re-calculate column_widths only if pack widgets changed by @penguinolog in https://github.com/urwid/urwid/pull/1178
+Bug fixes 🕷
+++++++++++++
+* Fix IndexError in decompose_tagmarkup when a nested sublist is empty by @gaoflow in https://github.com/urwid/urwid/pull/1172
+Documentation 🕮
+++++++++++++++++
+* Typing: partially annotate examples and fix annotations by @penguinolog in https://github.com/urwid/urwid/pull/1173
+* urwid.WidgetContainerMixin: return use protocol base class by @penguinolog in https://github.com/urwid/urwid/pull/1181
+
+New Contributors
+++++++++++++++++
+* @gaoflow made their first contribution in https://github.com/urwid/urwid/pull/1172
+
+**Full Changelog**: https://github.com/urwid/urwid/compare/4.0.3...4.0.4
+
+Urwid 4.0.3
+===========
+
+2026-06-25
+
+Deprecations ⚡
+++++++++++++++
+* Deprecate `content_delta` as unused by @penguinolog in https://github.com/urwid/urwid/pull/1151
+Bug fixes 🕷
+++++++++++++
+* Fix `shard_body_row`: falsy content_iter raises ValueError by @penguinolog in https://github.com/urwid/urwid/pull/1162
+Documentation 🕮
+++++++++++++++++
+* Mass typing annotations fixes.
+
+**Full Changelog**: https://github.com/urwid/urwid/compare/4.0.2...4.0.3
+
 Urwid 4.0.2
 ===========
 

{urwid-4.0.2 → urwid-4.0.4}/docs/examples/bigtext.py

@@ -48,7 +48,7 @@ class SwitchingPadding(urwid.Padding[_Wrapped]):
 
 
 class BigTextDisplay:
-    palette: typing.ClassVar[list[tuple[str, str, str, ...]]] = [
+    palette: typing.ClassVar[list[tuple[str, str, str] | tuple[str, str, str, str]]] = [
         ("body", "black", "light gray", "standout"),
         ("header", "white", "dark red", "bold"),
         ("button normal", "light gray", "dark blue", "standout"),

{urwid-4.0.2 → urwid-4.0.4}/docs/examples/graph.py

@@ -33,6 +33,9 @@ import typing
 
 import urwid
 
+if typing.TYPE_CHECKING:
+    from collections.abc import Callable
+
 UPDATE_INTERVAL = 0.2
 
 
@@ -52,7 +55,7 @@ class GraphModel:
 
     data_max_value = 100
 
-    def __init__(self):
+    def __init__(self) -> None:
         data = [
             ("Saw", list(range(0, 100, 2)) * 2),
             ("Square", [0] * 30 + [100] * 30),
@@ -66,13 +69,13 @@ class GraphModel:
             self.modes.append(m)
             self.data[m] = d
 
-    def get_modes(self):
+    def get_modes(self) -> list[str]:
         return self.modes
 
-    def set_mode(self, m) -> None:
+    def set_mode(self, m: str) -> None:
         self.current_mode = m
 
-    def get_data(self, offset, r):
+    def get_data(self, offset: int, r):
         """
         Return the data in [offset:offset+r], the maximum value
         for items returned, and the offset at which the data
@@ -95,7 +98,7 @@ class GraphView(urwid.WidgetWrap):
     graph display.
     """
 
-    palette: typing.ClassVar[tuple[str, str, str, ...]] = [
+    palette: typing.ClassVar[list[tuple[str, str, str] | tuple[str, str, str, str]]] = [
         ("body", "black", "light gray", "standout"),
         ("header", "white", "dark red", "bold"),
         ("screen edge", "light blue", "dark cyan"),
@@ -118,7 +121,7 @@ class GraphView(urwid.WidgetWrap):
     graph_num_bars = 5
     graph_offset_per_second = 5
 
-    def __init__(self, controller):
+    def __init__(self, controller) -> None:
         self.controller = controller
         self.started = True
         self.start_time = None
@@ -126,7 +129,7 @@ class GraphView(urwid.WidgetWrap):
         self.last_offset = None
         super().__init__(self.main_window())
 
-    def get_offset_now(self):
+    def get_offset_now(self) -> int:
         if self.start_time is None:
             return 0
         if not self.started:
@@ -134,7 +137,7 @@ class GraphView(urwid.WidgetWrap):
         tdelta = time.time() - self.start_time
         return int(self.offset + (tdelta * self.graph_offset_per_second))
 
-    def update_graph(self, force_update=False):
+    def update_graph(self, force_update: bool = False) -> bool:
         o = self.get_offset_now()
         if o == self.last_offset and not force_update:
             return False
@@ -164,32 +167,32 @@ class GraphView(urwid.WidgetWrap):
         self.animate_progress.current = prog
         return True
 
-    def on_animate_button(self, button):
+    def on_animate_button(self, button: urwid.AttrMap[urwid.Button]) -> None:
         """Toggle started state and button text."""
         if self.started:  # stop animation
-            button.base_widget.set_label("Start")
+            button.set_label("Start")
             self.offset = self.get_offset_now()
             self.started = False
             self.controller.stop_animation()
         else:
-            button.base_widget.set_label("Stop")
+            button.set_label("Stop")
             self.started = True
             self.start_time = time.time()
             self.controller.animate_graph()
 
-    def on_reset_button(self, w):
+    def on_reset_button(self, w: urwid.Button) -> None:
         self.offset = 0
         self.start_time = time.time()
         self.update_graph(True)
 
-    def on_mode_button(self, button, state):
+    def on_mode_button(self, button: urwid.RadioButton, state: bool) -> None:
         """Notify the controller of a new mode setting."""
         if state:
             # The new mode is the label of the button
             self.controller.set_mode(button.get_label())
         self.last_offset = None
 
-    def on_mode_change(self, m):
+    def on_mode_change(self, m: str) -> None:
         """Handle external mode change by updating radio buttons."""
         for rb in self.mode_buttons:
             if rb.base_widget.label == m:
@@ -197,7 +200,7 @@ class GraphView(urwid.WidgetWrap):
                 break
         self.last_offset = None
 
-    def on_unicode_checkbox(self, w, state):
+    def on_unicode_checkbox(self, w: urwid.CheckBox, state: bool) -> None:
         self.graph = self.bar_graph(state)
         self.graph_wrap._w = self.graph
         self.animate_progress = self.progress_bar(state)
@@ -235,30 +238,42 @@ class GraphView(urwid.WidgetWrap):
         )
         return w
 
-    def bar_graph(self, smooth=False):
+    def bar_graph(self, smooth: bool = False) -> urwid.BarGraph:
         satt = None
         if smooth:
             satt = {(1, 0): "bg 1 smooth", (2, 0): "bg 2 smooth"}
         w = urwid.BarGraph(["bg background", "bg 1", "bg 2"], satt=satt)
         return w
 
-    def button(self, t, fn):
+    def button(
+        self,
+        t: str,
+        fn: Callable[[urwid.Button], None],
+    ) -> urwid.AttrMap[urwid.Button]:
         w = urwid.Button(t, fn)
         w = urwid.AttrMap(w, "button normal", "button select")
         return w
 
-    def radio_button(self, g, label, fn):
+    def radio_button(
+        self,
+        g: list[urwid.RadioButton],
+        label: str,
+        fn: Callable[[urwid.RadioButton, bool], None],
+    ) -> urwid.AttrMap[urwid.RadioButton]:
         w = urwid.RadioButton(g, label, False, on_state_change=fn)
         w = urwid.AttrMap(w, "button normal", "button select")
         return w
 
-    def progress_bar(self, smooth=False):
-        if smooth:
-            return urwid.ProgressBar("pg normal", "pg complete", 0, 1, "pg smooth")
-
-        return urwid.ProgressBar("pg normal", "pg complete", 0, 1)
+    def progress_bar(self, smooth: bool = False) -> urwid.ProgressBar:
+        return urwid.ProgressBar(
+            "pg normal",
+            "pg complete",
+            0,
+            1,
+            "pg smooth" if smooth else None,
+        )
 
-    def exit_program(self, w):
+    def exit_program(self, w) -> typing.NoReturn:
         raise urwid.ExitMainLoop()
 
     def graph_controls(self):
@@ -271,7 +286,7 @@ class GraphView(urwid.WidgetWrap):
             self.mode_buttons.append(rb)
         # setup animate button
         self.animate_button = self.button("", self.on_animate_button)
-        self.on_animate_button(self.animate_button)
+        self.on_animate_button(self.animate_button.original_widget)
         self.offset = 0
         self.animate_progress = self.progress_bar()
         animate_controls = urwid.GridFlow(

{urwid-4.0.2 → urwid-4.0.4}/docs/examples/pop_up.py

@@ -7,12 +7,12 @@ import typing
 import urwid
 
 
-class PopUpDialog(urwid.WidgetWrap):
+class PopUpDialog(urwid.WidgetWrap[urwid.AttrMap[urwid.Filler[urwid.Pile]]]):
     """A dialog that appears with nothing but a close button"""
 
     signals: typing.ClassVar[list[str]] = ["close"]
 
-    def __init__(self):
+    def __init__(self) -> None:
         close_button = urwid.Button("that's pretty cool")
         urwid.connect_signal(close_button, "click", lambda button: self._emit("close"))
         pile = urwid.Pile(
@@ -24,7 +24,7 @@ class PopUpDialog(urwid.WidgetWrap):
         super().__init__(urwid.AttrMap(urwid.Filler(pile), "popbg"))
 
 
-class ThingWithAPopUp(urwid.PopUpLauncher):
+class ThingWithAPopUp(urwid.PopUpLauncher[urwid.Button]):
     def __init__(self) -> None:
         super().__init__(urwid.Button("click-me"))
         urwid.connect_signal(self.original_widget, "click", lambda button: self.open_pop_up())

{urwid-4.0.2 → urwid-4.0.4}/docs/examples/real_browse.py

@@ -178,9 +178,9 @@ class DirectoryNode(urwid.ParentNode):
         parent.set_child_node(self.get_key(), self)
         return parent
 
-    def load_child_keys(self):
-        dirs = []
-        files = []
+    def load_child_keys(self) -> list[str] | list[None]:
+        dirs: list[str] = []
+        files: list[str] = []
         try:
             path = self.get_value()
             # separate dirs and files
@@ -207,7 +207,7 @@ class DirectoryNode(urwid.ParentNode):
             keys = [None]
         return keys
 
-    def load_child_node(self, key) -> EmptyNode | DirectoryNode | FileNode:
+    def load_child_node(self, key: Hashable) -> EmptyNode | DirectoryNode | FileNode:
         """Return either a FileNode or DirectoryNode"""
         index = self.get_child_index(key)
         if key is None:
@@ -225,11 +225,11 @@ class DirectoryNode(urwid.ParentNode):
 
 
 class DirectoryBrowser:
-    palette: typing.ClassVar[list[tuple[str, str, str, ...]]] = [
+    palette: typing.ClassVar[list[tuple[str, ...] | tuple[str, str, str, str]]] = [
         ("body", "black", "light gray"),
-        ("flagged", "black", "dark green", ("bold", "underline")),
+        ("flagged", "black", "dark green", "bold,underline"),
         ("focus", "light gray", "dark blue", "standout"),
-        ("flagged focus", "yellow", "dark cyan", ("bold", "standout", "underline")),
+        ("flagged focus", "yellow", "dark cyan", "bold,standout,underline"),
         ("head", "yellow", "black", "standout"),
         ("foot", "light gray", "black"),
         ("key", "light cyan", "black", "underline"),

{urwid-4.0.2 → urwid-4.0.4}/docs/examples/real_edit.py

@@ -51,10 +51,10 @@ class LineWalker(urwid.ListWalker):
         if self.file is not None:
             self.file.close()
 
-    def get_focus(self):
+    def get_focus(self) -> tuple[urwid.Edit, int] | tuple[None, None]:
         return self._get_at_pos(self.focus)
 
-    def set_focus(self, focus) -> None:
+    def set_focus(self, focus: int) -> None:
         self.focus = focus
         self._modified()
 
@@ -145,7 +145,7 @@ class LineWalker(urwid.ListWalker):
 
 
 class EditDisplay:
-    palette: typing.ClassVar[list[tuple[str, str, str, ...]]] = [
+    palette: typing.ClassVar[list[tuple[str, str, str] | tuple[str, str, str, str]]] = [
         ("body", "default", "default"),
         ("foot", "dark cyan", "dark blue", "bold"),
         ("key", "light cyan", "dark blue", "underline"),
@@ -231,7 +231,7 @@ class EditDisplay:
                 prefix = "\n"
 
 
-def re_tab(s) -> str:
+def re_tab(s: str) -> str:
     """Return a tabbed string from an expanded one."""
     line = []
     p = 0

{urwid-4.0.2 → urwid-4.0.4}/docs/examples/tour.py

@@ -159,7 +159,7 @@ def main():
         " widget is used to keep the instructions at the top of the screen.",
     ]
 
-    def button_press(button):
+    def button_press(button: urwid.Button) -> None:
         frame.footer = urwid.AttrMap(urwid.Text(["Pressed: ", button.get_label()]), "header")
 
     radio_button_group = []
@@ -355,11 +355,11 @@ def main():
         ("body", "black", "light gray", "standout"),
         ("reverse", "light gray", "black"),
         ("header", "white", "dark red", "bold"),
-        ("important", "dark blue", "light gray", ("standout", "underline")),
+        ("important", "dark blue", "light gray", "standout,underline"),
         ("editfc", "white", "dark blue", "bold"),
         ("editbx", "light gray", "dark blue"),
         ("editcp", "black", "light gray", "standout"),
-        ("bright", "dark gray", "light gray", ("bold", "standout")),
+        ("bright", "dark gray", "light gray", "bold,standout"),
         ("buttn", "black", "dark cyan"),
         ("buttnf", "white", "dark blue", "bold"),
     ]

{urwid-4.0.2 → urwid-4.0.4}/examples/bigtext.py

@@ -48,7 +48,7 @@ class SwitchingPadding(urwid.Padding[_Wrapped]):
 
 
 class BigTextDisplay:
-    palette: typing.ClassVar[list[tuple[str, str, str, ...]]] = [
+    palette: typing.ClassVar[list[tuple[str, str, str] | tuple[str, str, str, str]]] = [
         ("body", "black", "light gray", "standout"),
         ("header", "white", "dark red", "bold"),
         ("button normal", "light gray", "dark blue", "standout"),

{urwid-4.0.2 → urwid-4.0.4}/examples/browse.py

@@ -178,9 +178,9 @@ class DirectoryNode(urwid.ParentNode):
         parent.set_child_node(self.get_key(), self)
         return parent
 
-    def load_child_keys(self):
-        dirs = []
-        files = []
+    def load_child_keys(self) -> list[str] | list[None]:
+        dirs: list[str] = []
+        files: list[str] = []
         try:
             path = self.get_value()
             # separate dirs and files
@@ -207,7 +207,7 @@ class DirectoryNode(urwid.ParentNode):
             keys = [None]
         return keys
 
-    def load_child_node(self, key) -> EmptyNode | DirectoryNode | FileNode:
+    def load_child_node(self, key: Hashable) -> EmptyNode | DirectoryNode | FileNode:
         """Return either a FileNode or DirectoryNode"""
         index = self.get_child_index(key)
         if key is None:
@@ -225,11 +225,11 @@ class DirectoryNode(urwid.ParentNode):
 
 
 class DirectoryBrowser:
-    palette: typing.ClassVar[list[tuple[str, str, str, ...]]] = [
+    palette: typing.ClassVar[list[tuple[str, ...] | tuple[str, str, str, str]]] = [
         ("body", "black", "light gray"),
-        ("flagged", "black", "dark green", ("bold", "underline")),
+        ("flagged", "black", "dark green", "bold,underline"),
         ("focus", "light gray", "dark blue", "standout"),
-        ("flagged focus", "yellow", "dark cyan", ("bold", "standout", "underline")),
+        ("flagged focus", "yellow", "dark cyan", "bold,standout,underline"),
         ("head", "yellow", "black", "standout"),
         ("foot", "light gray", "black"),
         ("key", "light cyan", "black", "underline"),