urwid 3.0.1__tar.gz → 3.0.3__tar.gz

urwid-3.0.3/.devcontainer/dev.dockerfile

@@ -0,0 +1,15 @@
+FROM ubuntu:24.04
+RUN apt-get update -y \
+    && apt-get upgrade -y \
+    && apt-get install -y \
+      python3-dev \
+      python3-pip \
+      python3-virtualenv \
+      python3-gi \
+      python3-gi-cairo \
+      gobject-introspection \
+      libgirepository-2.0-dev \
+      libcairo2-dev \
+    && apt-get clean
+RUN mkdir -p ~/.virtualenvs \
+    && virtualenv --download ~/.virtualenvs/urwid

{urwid-3.0.1 → urwid-3.0.3}/.devcontainer/devcontainer.json

@@ -6,6 +6,11 @@
     "ghcr.io/devcontainers/features/github-cli": {}
   },
   "customizations": {
+    "jetbrains": {
+      "settings": {
+        "com.intellij:app:Vcs-Log-App-Settings.show_changes_from_parents": true
+      }
+    },
     // Configure properties specific to VS Code.
     "vscode": {
       // Set *default* container specific settings.json values on container create.
@@ -32,4 +37,4 @@
   "init": true,
   "postCreateCommand": "~/.virtualenvs/urwid/bin/pip3 install isort black ruff pylint refurb mypy",
   "postStartCommand": "~/.virtualenvs/urwid/bin/pip3 install -r test_requirements.txt PyGObject && ~/.virtualenvs/urwid/bin/pip3 install -U -e ."
-}
+}

{urwid-3.0.1 → urwid-3.0.3}/.github/workflows/documentation.yml

@@ -23,11 +23,11 @@ jobs:
   Build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0  # need for setuptools_scm
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'

{urwid-3.0.1 → urwid-3.0.3}/.github/workflows/isolated_static_check.yml

@@ -16,9 +16,9 @@ jobs:
     name: Validate import sorting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'
@@ -34,9 +34,9 @@ jobs:
     name: Validate black formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'
@@ -52,9 +52,9 @@ jobs:
     name: Check with Ruff
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'
@@ -70,14 +70,14 @@ jobs:
     name: Check with pylint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get -qq update
           sudo apt-get install -y python3-dev python3-gi python3-gi-cairo
           sudo apt-get install -y gobject-introspection libgirepository-2.0-dev libcairo2-dev
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'

{urwid-3.0.1 → urwid-3.0.3}/.github/workflows/labels.yml

@@ -10,6 +10,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v6
       with:
         dot: true

{urwid-3.0.1 → urwid-3.0.3}/.github/workflows/pythonpackage.yml

@@ -30,9 +30,9 @@ jobs:
     name: Validate import sorting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'
@@ -48,9 +48,9 @@ jobs:
     name: Validate black formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'
@@ -66,9 +66,9 @@ jobs:
     name: Check with Ruff
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'
@@ -84,14 +84,14 @@ jobs:
     name: Check with pylint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get -qq update
           sudo apt-get install -y python3-dev python3-gi python3-gi-cairo
           sudo apt-get install -y gobject-introspection libgirepository-2.0-dev libcairo2-dev
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'
@@ -117,11 +117,11 @@ jobs:
         python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0  # need for setuptools_scm
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
@@ -173,11 +173,11 @@ jobs:
     needs: [ Test, Isort, Black, Ruff, PyLint ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0  # need for setuptools_scm
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 
@@ -204,9 +204,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ build ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'
@@ -214,7 +214,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade twine
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           # unpacks default artifact into dist/
           # if `name: wheels` is omitted, the action will create extra parent dir
@@ -239,7 +239,7 @@ jobs:
     permissions:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           pattern: built-*
           merge-multiple: true

{urwid-3.0.1 → urwid-3.0.3}/.github/workflows/yamllint.yml

@@ -10,9 +10,9 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           cache: 'pip'

{urwid-3.0.1 → urwid-3.0.3}/.pre-commit-config.yaml

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

{urwid-3.0.1 → urwid-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 3.0.1
+Version: 3.0.3
 Summary: A full-featured console (xterm et al.) user interface library
 Author-email: Ian Ward <ian@excess.org>
 License: LGPL-2.1-only
@@ -104,6 +104,8 @@ Alternatively if you are on Debian or Ubuntu
 Windows support notes
 =====================
 
+Windows support is limited to the Windows 10+ due to ANSI support requirement.
+
 * Not supported:
 
 1. Terminal widget and all related render API (TermCanvas, TermCharset, TermModes, TermScroller)

{urwid-3.0.1 → urwid-3.0.3}/README.rst

@@ -49,6 +49,8 @@ Alternatively if you are on Debian or Ubuntu
 Windows support notes
 =====================
 
+Windows support is limited to the Windows 10+ due to ANSI support requirement.
+
 * Not supported:
 
 1. Terminal widget and all related render API (TermCanvas, TermCharset, TermModes, TermScroller)

{urwid-3.0.1 → urwid-3.0.3}/docs/changelog.rst

@@ -2,6 +2,39 @@
 Changelog
 ---------
 
+Urwid 3.0.3
+===========
+
+2025-09-15
+
+Bug fixes 🕷
+++++++++++++
+* Python 3.14: fix buffer overflow on terminal size request by @meeuw in https://github.com/urwid/urwid/pull/1027
+* Add guard against empty list on focus complete. by @gryf in https://github.com/urwid/urwid/pull/1047
+
+Documentation 🕮
+++++++++++++++++
+* Add extra code type annotations by @penguinolog in https://github.com/urwid/urwid/pull/1037
+* Mark Windows support limitation: win10+ only by @penguinolog in https://github.com/urwid/urwid/pull/1038
+
+Other Changes
++++++++++++++
+* Maintenance: fix devcontainer to support actual requirements without pinning by @penguinolog in https://github.com/urwid/urwid/pull/1035
+
+New Contributors
+++++++++++++++++
+* @meeuw made their first contribution in https://github.com/urwid/urwid/pull/1027
+* @gryf made their first contribution in https://github.com/urwid/urwid/pull/1047
+
+Urwid 3.0.2
+===========
+
+2025-05-07
+
+Bug fixes 🕷
+++++++++++++
+* Bugfix: Corner case: Scrollbar render for only 1 row height by @penguinolog in https://github.com/urwid/urwid/pull/1021
+
 Urwid 3.0.1
 ===========
 

{urwid-3.0.1 → urwid-3.0.3/docs}/examples/palette_test.py

@@ -283,7 +283,7 @@ def parse_chart(chart: str, convert):
                 entry = entry[elen:].strip()
             else:  # try the whole thing
                 attrtext = convert(entry.strip())
-                assert attrtext, f"Invalid palette entry: {entry!r}"  # noqa: S101  # "assert" is ok for examples
+                assert attrtext, f"Invalid palette entry: {entry!r}"  # noqa: S101  # "assert" is OK for examples
                 elen = len(entry)
                 entry = ""
             attr, text = attrtext

{urwid-3.0.1 → urwid-3.0.3}/docs/examples/real_edit.py

@@ -99,7 +99,7 @@ class LineWalker(urwid.ListWalker):
             # file is closed, so there are no more lines
             return None, None
 
-        assert pos == len(self.lines), "out of order request?"  # noqa: S101  # "assert" is ok in examples
+        assert pos == len(self.lines), "out of order request?"  # noqa: S101  # "assert" is OK in examples
 
         self.read_next_line()
 

{urwid-3.0.1 → urwid-3.0.3}/docs/manual/wanat_multi.py

@@ -9,7 +9,7 @@ class MultiPudding(urwid.Widget):
     def rows(self, size: tuple[int], focus: bool = False) -> int:
         return 1
 
-    def render(self, size: tuple[int], focus: bool = False) -> urwid.TextCanvas:
+    def render(self, size: tuple[int] | tuple[int, int], focus: bool = False) -> urwid.TextCanvas:
         if len(size) == 1:
             (maxcol,) = size
             maxrow = 1

{urwid-3.0.1 → urwid-3.0.3}/examples/asyncio_socket_server.py

@@ -91,13 +91,13 @@ class AsyncScreen(Screen):
 
     _pending_task = None
 
-    def write(self, data):
+    def write(self, data: str) -> None:
         self.writer.write(data.encode(self.encoding))
 
-    def flush(self):
+    def flush(self) -> None:
         pass
 
-    def hook_event_loop(self, event_loop, callback):
+    def hook_event_loop(self, event_loop: urwid.AsyncioEventLoop, callback) -> None:
         # Wait on the reader's read coro, and when there's data to read, call
         # the callback and then wait again
         def pump_reader(fut=None):
@@ -126,14 +126,14 @@ class AsyncScreen(Screen):
 
         pump_reader()
 
-    def unhook_event_loop(self, event_loop):
+    def unhook_event_loop(self, event_loop) -> None:
         if self._pending_task:
             self._pending_task.cancel()
             del self._pending_task
 
 
 class UrwidProtocol(asyncio.Protocol):
-    def connection_made(self, transport):
+    def connection_made(self, transport) -> None:
         print("Got a client!")
         self.transport = transport
 
@@ -155,10 +155,10 @@ class UrwidProtocol(asyncio.Protocol):
 
         self.urwid_loop.start()
 
-    def data_received(self, data):
+    def data_received(self, data: bytes) -> None:
         self.reader.feed_data(data)
 
-    def connection_lost(self, exc):
+    def connection_lost(self, exc: Exception | None) -> None:
         print("Lost a client...")
         self.reader.feed_eof()
         self.urwid_loop.stop()

{urwid-3.0.1 → urwid-3.0.3}/examples/edit.py

@@ -99,7 +99,7 @@ class LineWalker(urwid.ListWalker):
             # file is closed, so there are no more lines
             return None, None
 
-        assert pos == len(self.lines), "out of order request?"  # noqa: S101  # "assert" is ok in examples
+        assert pos == len(self.lines), "out of order request?"  # noqa: S101  # "assert" is OK in examples
 
         self.read_next_line()
 

{urwid-3.0.1 → urwid-3.0.3}/examples/lcd_cf635.py

@@ -168,7 +168,7 @@ class LCDHorizontalSlider(urwid.WidgetWrap[urwid.Columns]):
         # move the slider based on which arrow is focused
         if key == "enter":
             # use the correct size for adjusting the bar
-            self.bar.move_position((self._w.column_widths(size)[1],), self._w.get_focus_column() != 0)
+            self.bar.move_position((self._w.column_widths(size)[1],), self._w.focus_position != 0)
             self.callback(self.bar.value)
             return None
 

{urwid-3.0.1/docs → urwid-3.0.3}/examples/palette_test.py

@@ -283,7 +283,7 @@ def parse_chart(chart: str, convert):
                 entry = entry[elen:].strip()
             else:  # try the whole thing
                 attrtext = convert(entry.strip())
-                assert attrtext, f"Invalid palette entry: {entry!r}"  # noqa: S101  # "assert" is ok for examples
+                assert attrtext, f"Invalid palette entry: {entry!r}"  # noqa: S101  # "assert" is OK for examples
                 elen = len(entry)
                 entry = ""
             attr, text = attrtext

{urwid-3.0.1 → urwid-3.0.3}/examples/twisted_serve_ssh.py

@@ -265,7 +265,7 @@ class TwistedScreen(Screen):
         self.loop.draw_screen()
 
     # Convenience
-    def write(self, data):
+    def write(self, data: str) -> None:
         self.terminal.write(data)
 
     # Private

urwid-3.0.3/pylint-requirements.txt

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

urwid-3.0.3/ruff-requirements.txt

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

{urwid-3.0.1 → urwid-3.0.3}/tests/test_scrollable.py

@@ -306,6 +306,24 @@ class TestScrollBarListBox(unittest.TestCase):
             widget.render(reduced_size).decoded_text,
         )
 
+    def test_minimal_height(self):
+        """If we have only 1 line render height and thumb position in the middle - do not render top."""
+        widget = urwid.ScrollBar(
+            urwid.ListBox(
+                (
+                    urwid.CheckBox("A"),
+                    urwid.CheckBox("B"),
+                    urwid.CheckBox("C"),
+                )
+            )
+        )
+        reduced_size = (7, 1)
+        self.assertEqual(("[ ] A █",), widget.render(reduced_size).decoded_text)
+        widget.keypress(reduced_size, "down")
+        self.assertEqual(("[ ] B █",), widget.render(reduced_size).decoded_text)
+        widget.keypress(reduced_size, "down")
+        self.assertEqual(("[ ] C █",), widget.render(reduced_size).decoded_text)
+
 
 def trivial_AttrMap(widget):
     return urwid.AttrMap(widget, {})

{urwid-3.0.1 → urwid-3.0.3}/urwid/canvas.py

@@ -84,7 +84,7 @@ class CanvasCache:
     cleanups = 0
 
     @classmethod
-    def store(cls, wcls, canvas: Canvas) -> None:
+    def store(cls, wcls: type[Widget], canvas: Canvas) -> None:
         """
         Store a weakref to canvas in the cache.
 
@@ -98,7 +98,7 @@ class CanvasCache:
             raise TypeError("Can't store canvas without widget_info")
         widget, size, focus = canvas.widget_info
 
-        def walk_depends(canv):
+        def walk_depends(canv: Canvas) -> list[Widget]:
             """
             Collect all child widgets for determining who we
             depend on.
@@ -128,7 +128,7 @@ class CanvasCache:
         cls._widgets.setdefault(widget, {})[wcls, size, focus] = ref
 
     @classmethod
-    def fetch(cls, widget, wcls, size, focus) -> Canvas | None:
+    def fetch(cls, widget: Widget, wcls: type[Widget], size, focus: bool) -> Canvas | None:
         """
         Return the cached canvas or None.
 
@@ -150,7 +150,7 @@ class CanvasCache:
         return canv
 
     @classmethod
-    def invalidate(cls, widget):
+    def invalidate(cls, widget: Widget) -> None:
         """
         Remove all canvases cached for widget.
         """
@@ -214,7 +214,7 @@ class Canvas:
 
     def __init__(self) -> None:
         """Base Canvas class"""
-        self._widget_info = None
+        self._widget_info: tuple[Widget, tuple[[]] | tuple[int] | tuple[int, int], bool] | None = None
         self.coords: dict[str, tuple[int, int, tuple[Widget, int, int]] | tuple[int, int, None]] = {}
         self.shortcuts: dict[str, str] = {}
 
@@ -240,7 +240,7 @@ class Canvas:
         self._widget_info = widget, size, focus
 
     @property
-    def widget_info(self):
+    def widget_info(self) -> tuple[Widget, tuple[[]] | tuple[int] | tuple[int, int], bool] | None:
         return self._widget_info
 
     @property

{urwid-3.0.1 → urwid-3.0.3}/urwid/display/_posix_raw_display.py

@@ -154,7 +154,7 @@ class Screen(_raw_display_base.Screen):
         if not os.environ.get("TERM", "").lower().startswith("linux"):
             return
 
-        m = Popen(  # noqa: S603  # pylint: disable=consider-using-with
+        m = Popen(  # pylint: disable=consider-using-with
             ["/usr/bin/mev", "-e", "158"],
             stdin=PIPE,
             stdout=PIPE,
@@ -175,7 +175,7 @@ class Screen(_raw_display_base.Screen):
         """
         Initialize the screen and input mode.
 
-        alternate_buffer -- use alternate screen buffer
+        alternate_buffer -- use an alternate screen buffer
         """
         if alternate_buffer:
             self.write(escape.SWITCH_TO_ALTERNATE_BUFFER)
@@ -403,8 +403,8 @@ class Screen(_raw_display_base.Screen):
         y, x = super().get_cols_rows()
         with contextlib.suppress(OSError):  # Term size could not be determined
             if hasattr(self._term_output_file, "fileno"):
-                buf = fcntl.ioctl(self._term_output_file.fileno(), termios.TIOCGWINSZ, b" " * 4)
-                y, x = struct.unpack("hh", buf)
+                buf = fcntl.ioctl(self._term_output_file.fileno(), termios.TIOCGWINSZ, b" " * 8)
+                y, x, _, _ = struct.unpack("hhhh", buf)
 
         # Provide some lightweight fallbacks in case the TIOCWINSZ doesn't
         # give sane answers

{urwid-3.0.1 → urwid-3.0.3}/urwid/display/_raw_display_base.py

@@ -211,7 +211,7 @@ class Screen(BaseScreen, RealTerminal):
         Restore the screen.
         """
 
-    def write(self, data):
+    def write(self, data: str) -> None:
         """Write some data to the terminal.
 
         You may wish to override this if you're using something other than
@@ -219,7 +219,7 @@ class Screen(BaseScreen, RealTerminal):
         """
         self._term_output_file.write(data)
 
-    def flush(self):
+    def flush(self) -> None:
         """Flush the output buffer.
 
         You may wish to override this if you're using something other than
@@ -352,7 +352,11 @@ class Screen(BaseScreen, RealTerminal):
 
     _input_timeout = None
 
-    def _make_legacy_input_wrapper(self, event_loop, callback):
+    def _make_legacy_input_wrapper(
+        self,
+        event_loop: EventLoop,
+        callback: Callable[[list[str], list[int]], typing.Any],
+    ) -> Callable[[], None]:
         """
         Support old Screen classes that still have a get_input_nonblocking and expect it to work.
         """
@@ -873,9 +877,8 @@ class Screen(BaseScreen, RealTerminal):
 
     def reset_default_terminal_palette(self) -> None:
         """
-        Attempt to set the terminal palette to default values as taken
-        from xterm.  Uses number of colors from current
-        set_terminal_properties() screen setting.
+        Attempt to set the terminal palette to default values as taken from xterm.
+        Uses a number of colors from the current set_terminal_properties() screen setting.
         """
         if self.colors == 1:
             return
@@ -898,9 +901,8 @@ class Screen(BaseScreen, RealTerminal):
         """
         entries - list of (index, red, green, blue) tuples.
 
-        Attempt to set part of the terminal palette (this does not work
-        on all terminals.)  The changes are sent as a single escape
-        sequence so they should all take effect at the same time.
+        Attempt to set part of the terminal palette (this does not work on all terminals.)
+        The changes are sent as a single escape sequence so they should all take effect at the same time.
 
         0 <= index < 256 (some terminals will only have 16 or 88 colors)
         0 <= red, green, blue < 256

{urwid-3.0.1 → urwid-3.0.3}/urwid/display/common.py

@@ -768,7 +768,7 @@ class AttrSpec:
             else:
                 scolor = _parse_color_256(_true_to_256(part) or part)
                 flags |= _FG_HIGH_COLOR
-            # _parse_color_*() return None for unrecognised colors
+            # _parse_color_*() return None for unrecognized colors
             if scolor is None:
                 raise AttrSpecError(f"Unrecognised color specification {part!r} in foreground ({foreground!r})")
             if color is not None:
@@ -1011,7 +1011,7 @@ class BaseScreen(abc.ABC, metaclass=signals.MetaSignals):
     def _stop(self) -> None:
         pass
 
-    def run_wrapper(self, fn, *args, **kwargs):
+    def run_wrapper(self, fn, *args, **kwargs) -> None:
         """Start the screen, call a function, then stop the screen.  Extra
         arguments are passed to `start`.
 

{urwid-3.0.1 → urwid-3.0.3}/urwid/display/curses.py

@@ -596,7 +596,7 @@ class Screen(BaseScreen, RealTerminal):
                             raise TypeError(seg)
                         self.s.addstr(seg.decode(util.get_encoding()))
                 except curses.error:
-                    # it's ok to get out of the
+                    # it's OK to get out of the
                     # screen on the lower right
                     if y != rows - 1 or nr != len(row) - 1:
                         # perhaps screen size changed