urwid 2.6.10__py3-none-any.whl → 2.6.12__py3-none-any.whl

urwid/canvas.py

@@ -935,7 +935,7 @@ def shard_body_row(sbody):
         else:  # noqa: PLR5501  # pylint: disable=else-if-used  # readability
             # need to skip this unchanged canvas
             if row and isinstance(row[-1], int):
-                row[-1] = row[-1] + cview[2]
+                row[-1] += cview[2]
             else:
                 row.append(cview[2])
 

urwid/display/_raw_display_base.py

@@ -544,9 +544,7 @@ class Screen(BaseScreen, RealTerminal):
         def is_blank_row(row: list[tuple[object, Literal["0", "U"] | None], bytes]) -> bool:
             if len(row) > 1:
                 return False
-            if row[0][2].strip():
-                return False
-            return True
+            return not row[0][2].strip()
 
         def attr_to_escape(a: AttrSpec | str | None) -> str:
             if a in self._pal_escape:

urwid/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.10'
-__version_tuple__ = version_tuple = (2, 6, 10)
+__version__ = version = '2.6.12'
+__version_tuple__ = version_tuple = (2, 6, 12)

urwid/widget/bar_graph.py

@@ -380,7 +380,7 @@ class BarGraph(Widget, metaclass=BarGraphMeta):
                 row_combine_last(count, row)
                 y_count -= count  # noqa: PLW2901
                 r += count
-                r = r % 8
+                r %= 8
                 if not y_count:
                     continue
             if r != 0:
@@ -508,7 +508,7 @@ def calculate_bargraph_display(bardata, top: float, bar_widths: list[int], maxro
 
     for r in rows:
         if r is None:
-            y_count = y_count + 1
+            y_count += 1
             continue
         if y_count:
             rowsets.append((y_count, last))

urwid/widget/monitored_list.py

@@ -24,9 +24,9 @@ import typing
 import warnings
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Callable, Collection, Iterator
+    from collections.abc import Callable, Collection, Iterable, Iterator
 
-    from typing_extensions import Concatenate, ParamSpec
+    from typing_extensions import Concatenate, ParamSpec, Self
 
     ArgSpec = ParamSpec("ArgSpec")
     Ret = typing.TypeVar("Ret")
@@ -88,23 +88,69 @@ class MonitoredList(typing.List[_T], typing.Generic[_T]):
         for item in self:
             yield None, item
 
-    __add__ = _call_modified(list.__add__)  # type: ignore[assignment]  # magic like old __super__
-    __delitem__ = _call_modified(list.__delitem__)  # type: ignore[assignment]  # magic like old __super__
-
-    __iadd__ = _call_modified(list.__iadd__)  # type: ignore[assignment]  # magic like old __super__
-    __imul__ = _call_modified(list.__imul__)  # type: ignore[assignment]  # magic like old __super__
-    __rmul__ = _call_modified(list.__rmul__)  # type: ignore[assignment]  # magic like old __super__
-    __setitem__ = _call_modified(list.__setitem__)  # type: ignore[assignment]  # magic like old __super__
-
-    append = _call_modified(list.append)  # type: ignore[assignment]  # magic like old __super__
-    extend = _call_modified(list.extend)  # type: ignore[assignment]  # magic like old __super__
-    insert = _call_modified(list.insert)  # type: ignore[assignment]  # magic like old __super__
-    pop = _call_modified(list.pop)  # type: ignore[assignment]  # magic like old __super__
-    remove = _call_modified(list.remove)  # type: ignore[assignment]  # magic like old __super__
-    reverse = _call_modified(list.reverse)  # type: ignore[assignment]  # magic like old __super__
-    sort = _call_modified(list.sort)  # type: ignore[assignment]  # magic like old __super__
-    if hasattr(list, "clear"):
-        clear = _call_modified(list.clear)  # type: ignore[assignment]  # magic like old __super__
+    @_call_modified
+    def __add__(self, __value: list[_T]) -> Self:
+        return super().__add__(__value)
+
+    @_call_modified
+    def __delitem__(self, __key: typing.SupportsIndex | slice) -> None:
+        super().__delitem__(__key)
+
+    @_call_modified
+    def __iadd__(self, __value: Iterable[_T]) -> Self:
+        return super().__iadd__(__value)
+
+    @_call_modified
+    def __rmul__(self, __value: typing.SupportsIndex) -> Self:
+        return super().__rmul__(__value)
+
+    @_call_modified
+    def __imul__(self, __value: typing.SupportsIndex) -> Self:
+        return super().__imul__(__value)
+
+    @typing.overload
+    @_call_modified
+    def __setitem__(self, __key: typing.SupportsIndex, __value: _T) -> None: ...
+
+    @typing.overload
+    @_call_modified
+    def __setitem__(self, __key: slice, __value: Iterable[_T]) -> None: ...
+
+    @_call_modified
+    def __setitem__(self, __key: typing.SupportsIndex | slice, __value: _T | Iterable[_T]) -> None:
+        super().__setitem__(__key, __value)
+
+    @_call_modified
+    def append(self, __object: _T) -> None:
+        super().append(__object)
+
+    @_call_modified
+    def extend(self, __iterable: Iterable[_T]) -> None:
+        super().extend(__iterable)
+
+    @_call_modified
+    def pop(self, __index: typing.SupportsIndex = -1) -> _T:
+        return super().pop(__index)
+
+    @_call_modified
+    def insert(self, __index: typing.SupportsIndex, __object: _T) -> None:
+        super().insert(__index, __object)
+
+    @_call_modified
+    def remove(self, __value: _T) -> None:
+        super().remove(__value)
+
+    @_call_modified
+    def reverse(self) -> None:
+        super().reverse()
+
+    @_call_modified
+    def sort(self, *, key: Callable[[_T], typing.Any] | None = None, reverse: bool = False) -> None:
+        super().sort(key=key, reverse=reverse)
+
+    @_call_modified
+    def clear(self) -> None:
+        super().clear()
 
 
 class MonitoredFocusList(MonitoredList[_T], typing.Generic[_T]):

urwid/widget/padding.py

@@ -40,12 +40,14 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
         self,
         w: WrappedWidget,
         align: (
-            Literal["left", "center", "right"] | Align | tuple[Literal["relative", WHSettings.RELATIVE], int]
+            Literal["left", "center", "right"]
+            | Align
+            | tuple[Literal["relative", WHSettings.RELATIVE, "fixed left", "fixed right"], int]
         ) = Align.LEFT,
         width: (
             int
             | Literal["pack", "clip", WHSettings.PACK, WHSettings.CLIP]
-            | tuple[Literal["relative", WHSettings.RELATIVE], int]
+            | tuple[Literal["relative", WHSettings.RELATIVE, "fixed left", "fixed right"], int]
         ) = RELATIVE_100,
         min_width: int | None = None,
         left: int = 0,

urwid/widget/popup.py

@@ -24,7 +24,7 @@ import typing
 
 from urwid.canvas import CompositeCanvas
 
-from .constants import Sizing
+from .constants import Align, Sizing, VAlign
 from .overlay import Overlay
 from .widget import delegate_to_widget_mixin
 from .widget_decoration import WidgetDecoration
@@ -86,8 +86,7 @@ class PopUpLauncher(delegate_to_widget_mixin("_original_widget"), WidgetDecorati
 
 
 class PopUpTarget(WidgetDecoration[WrappedWidget]):
-    # FIXME: this whole class is a terrible hack and must be fixed
-    # when layout and rendering are separated
+    # FIXME: this whole class is a terrible hack and must be fixed when layout and rendering are separated
     _sizing = frozenset((Sizing.BOX,))
     _selectable = True
 
@@ -105,19 +104,23 @@ class PopUpTarget(WidgetDecoration[WrappedWidget]):
             if self._pop_up != w:
                 self._pop_up = w
                 self._current_widget = Overlay(
-                    w,
-                    self._original_widget,
-                    ("fixed left", left),
-                    overlay_width,
-                    ("fixed top", top),
-                    overlay_height,
+                    top_w=w,
+                    bottom_w=self._original_widget,
+                    align=Align.LEFT,
+                    width=overlay_width,
+                    valign=VAlign.TOP,
+                    height=overlay_height,
+                    left=left,
+                    top=top,
                 )
             else:
                 self._current_widget.set_overlay_parameters(
-                    ("fixed left", left),
-                    overlay_width,
-                    ("fixed top", top),
-                    overlay_height,
+                    align=Align.LEFT,
+                    width=overlay_width,
+                    valign=VAlign.TOP,
+                    height=overlay_height,
+                    left=left,
+                    top=top,
                 )
         else:
             self._pop_up = None

urwid/widget/scrollable.py

@@ -137,6 +137,17 @@ class SupportsRelativeScroll(WidgetProto, Protocol):
     def get_visible_amount(self, size: tuple[int, int], focus: bool = False) -> int: ...
 
 
+def orig_iter(w: Widget) -> Iterator[Widget]:
+    visited = {w}
+    yield w
+    while hasattr(w, "original_widget"):
+        w = w.original_widget
+        if w in visited:
+            break
+        visited.add(w)
+        yield w
+
+
 class Scrollable(WidgetDecoration[WrappedWidget]):
     def sizing(self) -> frozenset[Sizing]:
         return frozenset((Sizing.BOX,))
@@ -481,7 +492,8 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
         """
         if Sizing.BOX not in widget.sizing():
             raise ValueError(f"Not a box widget: {widget!r}")
-        if not isinstance(widget, SupportsScroll):
+
+        if not any(isinstance(w, SupportsScroll) for w in orig_iter(widget)):
             raise TypeError(f"Not a scrollable widget: {widget!r}")
 
         super().__init__(widget)
@@ -612,12 +624,6 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
     def scrolling_base_widget(self) -> SupportsScroll | SupportsRelativeScroll:
         """Nearest `original_widget` that is compatible with the scrolling API"""
 
-        def orig_iter(w: Widget) -> Iterator[Widget]:
-            while hasattr(w, "original_widget"):
-                w = w.original_widget
-                yield w
-            yield w
-
         w = self
 
         for w in orig_iter(self):

urwid/widget/widget.py

@@ -592,7 +592,7 @@ class FlowWidget(Widget):
         )
         super().__init__()
 
-    def rows(self, size: int, focus: bool = False) -> int:
+    def rows(self, size: tuple[int], focus: bool = False) -> int:
         """
         All flow widgets must implement this function.
         """

urwid/widget/widget_decoration.py

@@ -105,9 +105,13 @@ class WidgetDecoration(Widget, typing.Generic[WrappedWidget]):  # pylint: disabl
         >>> wd3.base_widget is t
         True
         """
+        visited = {self}
         w = self
         while hasattr(w, "_original_widget"):
             w = w._original_widget
+            if w in visited:
+                break
+            visited.add(w)
         return w
 
     def _get_base_widget(self) -> Widget:

{urwid-2.6.10.dist-info → urwid-2.6.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.10
+Version: 2.6.12
 Summary: A full-featured console (xterm et al.) user interface library
 Home-page: https://urwid.org/
 Author-email: Ian Ward <ian@excess.org>

{urwid-2.6.10.dist-info → urwid-2.6.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 urwid/__init__.py,sha256=UMQZuTCtUPN9jHAEJ35lasW7IbBYRXy7NiRAKvyz4iE,8041
-urwid/canvas.py,sha256=6f3pSAJqg2pPsVaqcHfYx5robqvJ2JBX7xP_NQV8fqo,46750
+urwid/canvas.py,sha256=8awQrNgD6zewFAzPOYcjyiKUC8mv8yDZme7_hVpKnSE,46741
 urwid/command_map.py,sha256=M_OjrGY4yKn0jU3MEF9UOhBo2R6y_zZ-qo3LVIKNT_g,4310
 urwid/container.py,sha256=mikK50qN_Cu-8VlBRqQZzU4DcOvz8P_5CfozyyoIf3Q,1589
 urwid/decoration.py,sha256=sKfCe8SdSWZ4V0Ed_G4aumLxwwhnjoVvF70vlAhoXBE,1772
@@ -11,12 +11,12 @@ urwid/split_repr.py,sha256=pXzuddzQ4RnfIl537Gvoe8PVaBRHCPnxgdYvKK0qm8k,3899
 urwid/str_util.py,sha256=1ss-LHAhjXTynTVBcoSgYWIpBeN_RirqHYhP7fq7MrA,10844
 urwid/text_layout.py,sha256=lHiGfo7clmwHt5dMl_AaQSs2ov9IbY9JySTATZBm7h0,22821
 urwid/util.py,sha256=pGXnma03_IBx3v6_qN9cDWPXPj_YjkhQ9IxLjm_0TpU,15747
-urwid/version.py,sha256=Q6B6SJpzx7ArqUrw_2w87t72hs-NzqHnm-ERmJDUGVM,413
+urwid/version.py,sha256=Q7bo66dj80WEpDoVmCtISYC3ZL0QcWJqe3SGYxcts9s,413
 urwid/vterm.py,sha256=q9-8dxJpVr_7a0Bj_z_FYDiRgzos3IS17BjhYcy1RDw,58410
 urwid/wimp.py,sha256=o1YsjL_tBLXba8ZRr1MTHH0poLSlXT_atY3-uD_Ualg,567
 urwid/display/__init__.py,sha256=y90WbHPNRHlimPrXhzsSfFsBbBHy8QErmB1y4Xza-xo,1732
 urwid/display/_posix_raw_display.py,sha256=EkywAUNhhqgLquknP4tyicoo6QMdKG6uH6LApRmjoW8,14501
-urwid/display/_raw_display_base.py,sha256=dTpsLqNkaP7kPCfhPUMbEPgXhUhjzidq-uO_cWgZyow,33581
+urwid/display/_raw_display_base.py,sha256=B6mBR02J0kyBqWS6To0zdc_2hyl35czVfWnVzAV7wTY,33535
 urwid/display/_web.css,sha256=6HarEsIspH2egt51HSrgI8Yl2lGi-DbziWOdS4RHNlk,359
 urwid/display/_web.js,sha256=aWEOQ4EsADsiNgdw-zHEUMCRD2bnfR8M1mu4dOc2Tqk,12947
 urwid/display/_win32.py,sha256=hD4hytElpfIv5qxGNTMSa2QeBNByqJDNVpmiiQSj6CM,5401
@@ -41,7 +41,7 @@ urwid/event_loop/zmq_loop.py,sha256=wt4lE0hnDODTVaAMuB5wCSAD5yQ6D9pj8_G_7iNGBUI,
 urwid/widget/__init__.py,sha256=lEFAuQKYnGKS9-dhUggItnnm9Bvbbuk7RAKvzrs8xkI,4683
 urwid/widget/attr_map.py,sha256=L6svBcabtXeSaU2cNrgDv4Nne6QYk-nvVbr88sA4WnY,6205
 urwid/widget/attr_wrap.py,sha256=pJQHVNlwcX5IgpdSmTqYOt63EX-p5hA0mJfXtWXJ6wg,4830
-urwid/widget/bar_graph.py,sha256=Ui2Z-DJ7Try9rkAQ14rK__-oSGfsWncpJH-AxSF00bk,21615
+urwid/widget/bar_graph.py,sha256=1xQPKKVczMw_lDG4UBk5urUTAgtINN6SgEkVyZkaIU4,21603
 urwid/widget/big_text.py,sha256=Zvjbkdh4H1Wv9ZTdCbX23vfNyeybO8au-kUssE58Bbs,2393
 urwid/widget/box_adapter.py,sha256=uOFlZUaCK9A4H8Pmw6-OoS9QTYi9nn-LhlSa-JpC9Iw,4276
 urwid/widget/columns.py,sha256=Jz-0oR27uAoUV8LdhPWuCrkMgSHSYTxciNjxDCXPTbs,46508
@@ -54,21 +54,21 @@ urwid/widget/frame.py,sha256=AOe4FwjvwcIwrpXqyZkCwSZWwAALNl1XRMAKx6ZXYWs,21834
 urwid/widget/grid_flow.py,sha256=otujeOTWYDr4gwuDikBm9zZd8SUgma9yvQ1hDWI-dGk,21514
 urwid/widget/line_box.py,sha256=V750xiZtkw6_uRXLhNY91ER3pXwwrZstVv_IJUZd_YY,6884
 urwid/widget/listbox.py,sha256=EaGo13fpt4Oy9V00n27U-2PhOWa7-nmsTgnddKv9GII,74392
-urwid/widget/monitored_list.py,sha256=8lBb8kowLAqKMKByiBZp4jt9PSnXjYAoAjXFXm-7xcg,18773
+urwid/widget/monitored_list.py,sha256=mZUPYB1yhuKN6su6_VjmoiE0LlTXsYxkH14pbif0tbc,19264
 urwid/widget/overlay.py,sha256=7EtTHOomIF4xzwYiY7SiMCQZF2IHrmO88YeosFOMFo0,34505
-urwid/widget/padding.py,sha256=tdBJybrKJqR8OLo5DHixn6KZA3tefYlfo9kkqvxYLEc,21252
+urwid/widget/padding.py,sha256=pBXQsnkySV1GXgveg2Ivm6SCqHiGa2YkYSjXaoCUIHk,21334
 urwid/widget/pile.py,sha256=aIzKYNrSQtbHVk_bn2PElHUiSdsO_NKnL4mTu-sXm4I,38628
-urwid/widget/popup.py,sha256=UQ1MTzt8RNcfIvmwIqDM4mypxxXUOMsGoiozom8HfTg,5814
+urwid/widget/popup.py,sha256=vw9_S1UC6UMy5Roc4qK8NXgH5_dDGxoHmpDAi_u9wsI,5974
 urwid/widget/progress_bar.py,sha256=HRnIu2V2_4wgsnAdrhK-GVVToyLaXRH0gtlkWllA4Mo,4767
-urwid/widget/scrollable.py,sha256=yB3S3k5dOdZ-wrQMlgxQH-1AZONSf5X6Y2accIa9tpk,24279
+urwid/widget/scrollable.py,sha256=5L7axfY0Nn63H-NGIgJEyogl8e09ZdyKL5YxGHcmP1M,24352
 urwid/widget/solid_fill.py,sha256=NZRDSRK0lP4r7gXcKDgVaKEoeOcWvtrY5k2aueQEEL4,1260
 urwid/widget/text.py,sha256=jy15hL6rCBoJdZviq2jJ-i9eO6vEcxvzCIVAZs12AUw,12187
 urwid/widget/treetools.py,sha256=5s3Dnp2PCz4wQccutmdvsTTbAROJMLehXe4moB5POY0,17387
-urwid/widget/widget.py,sha256=dMGNVewj2NGFdGKAtDJYgOzhuJAtrr_BALOMwNzUyj0,29550
-urwid/widget/widget_decoration.py,sha256=aHP9Y7JKVCI2dw2OdRrzMj9p--C1pMIbxSJskWBLIgc,5633
+urwid/widget/widget.py,sha256=A0ZjvDjLqhdzelPFC96Ozo1voIoGkxftNmJh8X1IyNI,29557
+urwid/widget/widget_decoration.py,sha256=6eEPvtF7wk2n1csIBWrnXAosprFl2pZiQ7SoCpwKnJM,5736
 urwid/widget/wimp.py,sha256=4wfzTQBLMbhicSlL64hBPb-1W5FAFrIKfb43i10MKSY,27305
-urwid-2.6.10.dist-info/COPYING,sha256=NrbT-keRaUP9X-wxPFhHhJRgR-wTN6eLRA5ZkstZX4k,26434
-urwid-2.6.10.dist-info/METADATA,sha256=o9GKYe-Nt5Hkz7EF_S6E3DXp8CblUs66umXNmAj5-jI,11043
-urwid-2.6.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-urwid-2.6.10.dist-info/top_level.txt,sha256=AwxQA43kNkjHbhYELXHBKrQ01X5CR2KnDzU07cVqilY,6
-urwid-2.6.10.dist-info/RECORD,,
+urwid-2.6.12.dist-info/COPYING,sha256=NrbT-keRaUP9X-wxPFhHhJRgR-wTN6eLRA5ZkstZX4k,26434
+urwid-2.6.12.dist-info/METADATA,sha256=vu73SUW1PsgXOQBYsO0xEawmoT0WNQcMYbmW-ROhWDg,11043
+urwid-2.6.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+urwid-2.6.12.dist-info/top_level.txt,sha256=AwxQA43kNkjHbhYELXHBKrQ01X5CR2KnDzU07cVqilY,6
+urwid-2.6.12.dist-info/RECORD,,