urwid 2.6.15__tar.gz → 2.6.16__tar.gz

{urwid-2.6.15 → urwid-2.6.16}/.github/workflows/pythonpackage.yml

@@ -114,7 +114,11 @@ jobs:
         os: [ "ubuntu-latest", "windows-latest" ]
         # , "macos-latest"
         # enable macOS only if OS specific branch will be added
-        python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12" ]
+        python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ]
+        exclude:
+          # Not supported by external requirements
+          - os: "windows-latest"
+            python-version: "3.13"
 
     steps:
       - uses: actions/checkout@v4
@@ -178,7 +182,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.x"
 
       - name: Install dependencies
         run: pip install -U build

{urwid-2.6.15 → urwid-2.6.16}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.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.4.2
+    rev: 24.10.0
     hooks:
       - id: black
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.5.0
+    rev: v0.6.9
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix ]

{urwid-2.6.15 → urwid-2.6.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.15
+Version: 2.6.16
 Summary: A full-featured console (xterm et al.) user interface library
 Home-page: https://urwid.org/
 Author-email: Ian Ward <ian@excess.org>
@@ -29,6 +29,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -148,6 +149,7 @@ Supported Python versions
 - 3.10
 - 3.11
 - 3.12
+- 3.13
 - pypy3
 
 Authors

{urwid-2.6.15 → urwid-2.6.16}/README.rst

@@ -91,6 +91,7 @@ Supported Python versions
 - 3.10
 - 3.11
 - 3.12
+- 3.13
 - pypy3
 
 Authors

urwid-2.6.16/black-requirements.txt

@@ -0,0 +1 @@
+black==24.10.0

{urwid-2.6.15 → urwid-2.6.16}/classifiers.txt

@@ -16,6 +16,7 @@ Programming Language :: Python :: 3.9
 Programming Language :: Python :: 3.10
 Programming Language :: Python :: 3.11
 Programming Language :: Python :: 3.12
+Programming Language :: Python :: 3.13
 Programming Language :: Python :: 3 :: Only
 Programming Language :: Python :: Implementation :: CPython
-Programming Language :: Python :: Implementation :: PyPy
+Programming Language :: Python :: Implementation :: PyPy

urwid-2.6.16/pylint-requirements.txt

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

{urwid-2.6.15 → urwid-2.6.16}/pyproject.toml

@@ -240,6 +240,7 @@ disable = [
   "too-many-instance-attributes",
   "too-many-lines",
   "too-many-nested-blocks",
+  "too-many-positional-arguments",
   "broad-except",
   "broad-exception-raised",
   "logging-fstring-interpolation",

urwid-2.6.16/ruff-requirements.txt

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

{urwid-2.6.15 → urwid-2.6.16}/tests/test_columns.py

@@ -231,7 +231,7 @@ class ColumnsTest(unittest.TestCase):
 
     def test_render_pack_item_not_fit(self):
         items = urwid.Text("123"), urwid.Text("456")
-        widget = urwid.Columns(((urwid.PACK, item) for item in items))
+        widget = urwid.Columns((urwid.PACK, item) for item in items)
         # Make width < widget fixed pack
         width = items[0].pack(())[0] - 1
         height = items[0].rows((width,))

{urwid-2.6.15 → urwid-2.6.16}/tests/test_tree.py

@@ -2,13 +2,12 @@ from __future__ import annotations
 
 import typing
 import unittest
-from typing import Collection
 
 import urwid
 from urwid import TreeNode
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Hashable, Iterable
+    from collections.abc import Collection, Hashable, Iterable
 
 
 class SelfRegisteringParent(urwid.ParentNode):

{urwid-2.6.15 → urwid-2.6.16}/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{7,8,9,10,11},pypy3,isort,black,ruff,pylint,refurb
+envlist = py3{7,8,9,10,11,12,13},pypy3,isort,black,ruff,pylint,refurb
 skip_missing_interpreters = True
 
 [testenv]

{urwid-2.6.15 → urwid-2.6.16}/urwid/canvas.py

@@ -40,7 +40,7 @@ from urwid.util import (
 )
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Hashable, Iterable, Sequence
+    from collections.abc import Hashable, Iterable, Iterator, Sequence
 
     from typing_extensions import Literal
 
@@ -126,7 +126,7 @@ class CanvasCache:
 
         ref = weakref.ref(canvas, cls.cleanup)
         cls._refs[ref] = (widget, wcls, size, focus)
-        cls._widgets.setdefault(widget, {})[(wcls, size, focus)] = ref
+        cls._widgets.setdefault(widget, {})[wcls, size, focus] = ref
 
     @classmethod
     def fetch(cls, widget, wcls, size, focus) -> Canvas | None:
@@ -182,7 +182,7 @@ class CanvasCache:
         if not sizes:
             return
         with suppress(KeyError):
-            del sizes[(wcls, size, focus)]
+            del sizes[wcls, size, focus]
         if not sizes:
             with contextlib.suppress(KeyError):
                 del cls._widgets[widget]
@@ -282,7 +282,7 @@ class Canvas:
         cols: int | None = None,
         rows: int | None = None,
         attr=None,
-    ) -> Iterable[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
+    ) -> Iterator[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
         raise NotImplementedError()
 
     def cols(self) -> int:
@@ -376,7 +376,7 @@ class TextCanvas(Canvas):
 
     def __init__(
         self,
-        text: Sequence[bytes] | None = None,
+        text: list[bytes] | None = None,
         attr: list[list[tuple[Hashable | None, int]]] | None = None,
         cs: list[list[tuple[Literal["0", "U"] | None, int]]] | None = None,
         cursor: tuple[int, int] | None = None,
@@ -477,7 +477,7 @@ class TextCanvas(Canvas):
         cols: int | None = 0,
         rows: int | None = 0,
         attr=None,
-    ) -> Iterable[tuple[object, Literal["0", "U"] | None, bytes]]:
+    ) -> Iterator[tuple[object, Literal["0", "U"] | None, bytes]]:
         """
         Return the canvas content as a list of rows where each row
         is a list of (attr, cs, text) tuples.
@@ -551,7 +551,7 @@ class BlankCanvas(Canvas):
         cols: int | None = 0,
         rows: int | None = 0,
         attr=None,
-    ) -> Iterable[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
+    ) -> Iterator[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
         """
         return (cols, rows) of spaces with default attributes.
         """
@@ -603,7 +603,7 @@ class SolidCanvas(Canvas):
         cols: int | None = None,
         rows: int | None = None,
         attr=None,
-    ) -> Iterable[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
+    ) -> Iterator[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
         if cols is None:
             cols = self.size[0]
         if rows is None:
@@ -704,7 +704,7 @@ class CompositeCanvas(Canvas):
         cols: int | None = None,
         rows: int | None = None,
         attr=None,
-    ) -> Iterable[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
+    ) -> Iterator[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
         """
         Return the canvas content as a list of rows where each row
         is a list of (attr, cs, text) tuples.

{urwid-2.6.15 → urwid-2.6.16}/urwid/command_map.py

@@ -21,9 +21,10 @@ from __future__ import annotations
 
 import enum
 import typing
-from typing import Iterator
 
 if typing.TYPE_CHECKING:
+    from collections.abc import Iterator
+
     from typing_extensions import Self
 
 

{urwid-2.6.15 → urwid-2.6.16}/urwid/display/_posix_raw_display.py

@@ -56,6 +56,7 @@ class Screen(_raw_display_base.Screen):
         input: typing.TextIO = sys.stdin,  # noqa: A002  # pylint: disable=redefined-builtin
         output: typing.TextIO = sys.stdout,
         bracketed_paste_mode=False,
+        focus_reporting=False,
     ) -> None:
         """Initialize a screen that directly prints escape codes to an output
         terminal.
@@ -63,11 +64,15 @@ class Screen(_raw_display_base.Screen):
         bracketed_paste_mode -- enable bracketed paste mode in the host terminal.
             If the host terminal supports it, the application will receive `begin paste`
             and `end paste` keystrokes when the user pastes text.
+        focus_reporting -- enable focus reporting in the host terminal.
+            If the host terminal supports it, the application will receive `focus in`
+            and `focus out` keystrokes when the application gains and loses focus.
         """
         super().__init__(input, output)
         self.gpm_mev: Popen | None = None
         self.gpm_event_pending: bool = False
         self.bracketed_paste_mode = bracketed_paste_mode
+        self.focus_reporting = focus_reporting
 
         # These store the previous signal handlers after setting ours
         self._prev_sigcont_handler = None
@@ -79,7 +84,8 @@ class Screen(_raw_display_base.Screen):
             f"<{self.__class__.__name__}("
             f"input={self._term_input_file}, "
             f"output={self._term_output_file}, "
-            f"bracketed_paste_mode={self.bracketed_paste_mode})>"
+            f"bracketed_paste_mode={self.bracketed_paste_mode}, "
+            f"focus_reporting={self.focus_reporting})>"
         )
 
     def _sigwinch_handler(self, signum: int = 28, frame: FrameType | None = None) -> None:
@@ -180,6 +186,9 @@ class Screen(_raw_display_base.Screen):
         if self.bracketed_paste_mode:
             self.write(escape.ENABLE_BRACKETED_PASTE_MODE)
 
+        if self.focus_reporting:
+            self.write(escape.ENABLE_FOCUS_REPORTING)
+
         fd = self._input_fileno()
         if fd is not None and os.isatty(fd):
             self._old_termios_settings = termios.tcgetattr(fd)
@@ -207,15 +216,18 @@ class Screen(_raw_display_base.Screen):
         if self.bracketed_paste_mode:
             self.write(escape.DISABLE_BRACKETED_PASTE_MODE)
 
+        if self.focus_reporting:
+            self.write(escape.DISABLE_FOCUS_REPORTING)
+
         signals.emit_signal(self, INPUT_DESCRIPTORS_CHANGED)
 
         self.signal_restore()
 
+        self._stop_mouse_restore_buffer()
+
         fd = self._input_fileno()
         if fd is not None and os.isatty(fd):
-            termios.tcsetattr(fd, termios.TCSADRAIN, self._old_termios_settings)
-
-        self._stop_mouse_restore_buffer()
+            termios.tcsetattr(fd, termios.TCSAFLUSH, self._old_termios_settings)
 
         if self._old_signal_keys:
             self.tty_signal_keys(*self._old_signal_keys, fd)

{urwid-2.6.15 → urwid-2.6.16}/urwid/display/_win32_raw_display.py

@@ -246,11 +246,12 @@ class ReadInputThread(threading.Thread):
                     if not inp.Event.KeyEvent.bKeyDown:
                         continue
 
-                    input_data = inp.Event.KeyEvent.uChar.AsciiChar
-                    # On Windows atomic press/release of modifier keys produce phantom input with code NULL
+                    input_data = inp.Event.KeyEvent.uChar.UnicodeChar
+                    # On Windows atomic press/release of modifier keys produce phantom input with code NULL.
                     # This input cannot be decoded and should be handled as garbage.
-                    if input_data != b"\x00":
-                        self._input.send(input_data)
+                    input_bytes = input_data.encode("utf-8")
+                    if input_bytes != b"\x00":
+                        self._input.send(input_bytes)
 
                 elif inp.EventType == _win32.EventType.WINDOW_BUFFER_SIZE_EVENT:
                     self._resize()

{urwid-2.6.15 → urwid-2.6.16}/urwid/display/escape.py

@@ -32,7 +32,7 @@ from collections.abc import MutableMapping, Sequence
 from urwid import str_util
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Collection, Iterable
+    from collections.abc import Iterable
 
 # NOTE: because of circular imports (urwid.util -> urwid.escape -> urwid.util)
 # from urwid.util import is_mouse_event -- will not work here
@@ -85,6 +85,8 @@ input_sequences = [
     ("[F", "end"),
     ("[G", "5"),
     ("[H", "home"),
+    ("[I", "focus in"),
+    ("[O", "focus out"),
     ("[1~", "home"),
     ("[2~", "insert"),
     ("[3~", "delete"),
@@ -225,7 +227,7 @@ class KeyqueueTrie:
             MutableMapping[int, str | MutableMapping[int, str | MutableMapping[int, str]]]
             | typing.Literal["mouse", "sgrmouse"]
         ),
-        keys: Collection[int],
+        keys: Sequence[int],
         more_available: bool,
     ):
         if not isinstance(root, MutableMapping):
@@ -245,7 +247,7 @@ class KeyqueueTrie:
             return None
         return self.get_recurse(root[keys[0]], keys[1:], more_available)
 
-    def read_mouse_info(self, keys: Collection[int], more_available: bool):
+    def read_mouse_info(self, keys: Sequence[int], more_available: bool):
         if len(keys) < 3:
             if more_available:
                 raise MoreInputRequired()
@@ -284,7 +286,7 @@ class KeyqueueTrie:
 
         return ((f"{prefix}mouse {action}", button, x, y), keys[3:])
 
-    def read_sgrmouse_info(self, keys: Collection[int], more_available: bool):
+    def read_sgrmouse_info(self, keys: Sequence[int], more_available: bool):
         # Helpful links:
         # https://stackoverflow.com/questions/5966903/how-to-get-mousemove-and-mouseclick-in-bash
         # http://invisible-island.net/xterm/ctlseqs/ctlseqs.pdf
@@ -574,6 +576,9 @@ RESTORE_NORMAL_BUFFER = f"{ESC}[?1049l"
 ENABLE_BRACKETED_PASTE_MODE = f"{ESC}[?2004h"
 DISABLE_BRACKETED_PASTE_MODE = f"{ESC}[?2004l"
 
+ENABLE_FOCUS_REPORTING = f"{ESC}[?1004h"
+DISABLE_FOCUS_REPORTING = f"{ESC}[?1004l"
+
 # RESET_SCROLL_REGION = ESC+"[;r"
 # RESET = ESC+"c"
 

{urwid-2.6.15 → urwid-2.6.16}/urwid/font.py

@@ -192,9 +192,9 @@ class Font(metaclass=FontRegistry):
 
     __slots__ = ("canvas", "char", "utf8_required")
 
-    height: int
-    data: Sequence[str]
-    name: str
+    height: int  # pylint: disable=declare-non-slot
+    data: Sequence[str]  # pylint: disable=declare-non-slot
+    name: str  # pylint: disable=declare-non-slot
 
     def __init__(self) -> None:
         if not self.height:

{urwid-2.6.15 → urwid-2.6.16}/urwid/util.py

@@ -143,7 +143,7 @@ def get_encoding() -> str:
 
 
 @contextlib.contextmanager
-def set_temporary_encoding(encoding_name: str) -> Generator[None, None, None]:
+def set_temporary_encoding(encoding_name: str) -> Generator[None]:
     """Internal helper for encoding specific validation in unittests/doctests.
 
     Not exported globally.

{urwid-2.6.15 → urwid-2.6.16}/urwid/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.15'
-__version_tuple__ = version_tuple = (2, 6, 15)
+__version__ = version = '2.6.16'
+__version_tuple__ = version_tuple = (2, 6, 16)

{urwid-2.6.15 → urwid-2.6.16}/urwid/vterm.py

@@ -375,7 +375,7 @@ class TermCanvas(Canvas):
             lines = self.height // 2
 
         if not up:
-            lines = -lines  # pylint: disable=invalid-unary-operand-type  # type already narrowed
+            lines = -lines
 
         maxscroll = len(self.scrollback_buffer)
         self.scrolling_up += lines
@@ -1118,6 +1118,14 @@ class TermCanvas(Canvas):
             elif 40 <= attr <= 47:
                 bg = attr - 40
                 colors = max(16, colors)
+            # AIXTERM bright color spec
+            # https://en.wikipedia.org/wiki/ANSI_escape_code
+            elif 90 <= attr <= 97:
+                fg = attr - 90 + 8
+                colors = max(16, colors)
+            elif 100 <= attr <= 107:
+                bg = attr - 100 + 8
+                colors = max(16, colors)
             elif attr in {38, 48}:
                 if idx + 2 < len(attrs) and attrs[idx + 1] == 5:
                     # 8 bit color specification

{urwid-2.6.15 → urwid-2.6.16}/urwid/widget/bar_graph.py

@@ -410,7 +410,7 @@ class BarGraph(Widget, metaclass=BarGraphMeta):
                     if len(bar_type) == 3:
                         # vertical eighths
                         fg, bg, k = bar_type
-                        a = self.satt[(fg, bg)]
+                        a = self.satt[fg, bg]
                         t = self.eighths[k] * width
                     else:
                         # horizontal lines

{urwid-2.6.15 → urwid-2.6.16}/urwid/widget/columns.py

@@ -400,7 +400,7 @@ class Columns(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
                 chain(self.contents, repeat((None, (WHSettings.WEIGHT, 1, False)))),
             )
         ]
-        if focus_position < len(widgets):  # pylint: disable=consider-using-max-builtin  # pylint bug
+        if focus_position < len(widgets):
             self.focus_position = focus_position
 
     @property
@@ -441,7 +441,7 @@ class Columns(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
             (w, ({Sizing.FIXED: WHSettings.GIVEN, Sizing.FLOW: WHSettings.PACK}.get(new_t, new_t), new_n, b))
             for ((new_t, new_n), (w, (t, n, b))) in zip(column_types, self.contents)
         ]
-        if focus_position < len(column_types):  # pylint: disable=consider-using-max-builtin  # pylint bug
+        if focus_position < len(column_types):
             self.focus_position = focus_position
 
     @property

{urwid-2.6.15 → urwid-2.6.16}/urwid/widget/grid_flow.py

@@ -166,7 +166,7 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         )
         focus_position = self.focus_position
         self.contents = [(new, (WHSettings.GIVEN, self._cell_width)) for new in widgets]
-        if focus_position < len(widgets):  # pylint: disable=consider-using-max-builtin  # pylint bug
+        if focus_position < len(widgets):
             self.focus_position = focus_position
 
     def _get_cells(self):

{urwid-2.6.15 → urwid-2.6.16}/urwid/widget/pile.py

@@ -325,7 +325,7 @@ class Pile(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
                 chain(self.contents, repeat((None, (WHSettings.WEIGHT, 1)))),
             )
         ]
-        if focus_position < len(widgets):  # pylint: disable=consider-using-max-builtin  # pylint bug
+        if focus_position < len(widgets):
             self.focus_position = focus_position
 
     @property
@@ -365,7 +365,7 @@ class Pile(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
             (w, ({Sizing.FIXED: WHSettings.GIVEN, Sizing.FLOW: WHSettings.PACK}.get(new_t, new_t), new_height))
             for ((new_t, new_height), (w, options)) in zip(item_types, self.contents)
         ]
-        if focus_position < len(item_types):  # pylint: disable=consider-using-max-builtin  # pylint bug
+        if focus_position < len(item_types):
             self.focus_position = focus_position
 
     @property

{urwid-2.6.15 → urwid-2.6.16}/urwid/widget/progress_bar.py

@@ -8,6 +8,8 @@ from .text import Text
 from .widget import Widget
 
 if typing.TYPE_CHECKING:
+    from collections.abc import Hashable
+
     from urwid.canvas import TextCanvas
 
 
@@ -18,7 +20,14 @@ class ProgressBar(Widget):
 
     text_align = Align.CENTER
 
-    def __init__(self, normal, complete, current: int = 0, done: int = 100, satt=None):
+    def __init__(
+        self,
+        normal: Hashable | None,
+        complete: Hashable | None,
+        current: int = 0,
+        done: int = 100,
+        satt: Hashable | None = None,
+    ) -> None:
         """
         :param normal: display attribute for incomplete part of progress bar
         :param complete: display attribute for complete part of progress bar

{urwid-2.6.15 → urwid-2.6.16}/urwid/widget/scrollable.py

@@ -537,7 +537,7 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
         if use_relative:
             # `operator.length_hint` is Protocol (Spec) over class based and can end false-negative on the instance
             # use length_hint-like approach with safe `AttributeError` handling
-            ow_len = getattr(ow_base, "__len__", getattr(ow_base, "__length_hint__", lambda: 0))()
+            ow_len = getattr(ow_base, "__len__", getattr(ow_base, "__length_hint__", int))()
             ow_canv = render_for_scrollbar()
             visible_amount = ow_base.get_visible_amount(ow_size, focus)
             pos = ow_base.get_first_visible_pos(ow_size, focus)

{urwid-2.6.15 → urwid-2.6.16}/urwid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.15
+Version: 2.6.16
 Summary: A full-featured console (xterm et al.) user interface library
 Home-page: https://urwid.org/
 Author-email: Ian Ward <ian@excess.org>
@@ -29,6 +29,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -148,6 +149,7 @@ Supported Python versions
 - 3.10
 - 3.11
 - 3.12
+- 3.13
 - pypy3
 
 Authors

urwid-2.6.15/black-requirements.txt

@@ -1 +0,0 @@
-black==24.4.2

urwid-2.6.15/pylint-requirements.txt

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

urwid-2.6.15/ruff-requirements.txt

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