urwid 2.6.9__py3-none-any.whl → 2.6.11__py3-none-any.whl

urwid/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.9'
-__version_tuple__ = version_tuple = (2, 6, 9)
+__version__ = version = '2.6.11'
+__version_tuple__ = version_tuple = (2, 6, 11)

urwid/widget/listbox.py

@@ -20,6 +20,7 @@
 
 from __future__ import annotations
 
+import operator
 import typing
 import warnings
 from collections.abc import Iterable, Sized
@@ -77,6 +78,18 @@ class ScrollSupportingBody(Protocol):
     def get_prev(self, position: _K) -> tuple[Widget, _K] | tuple[None, None]: ...
 
 
+@runtime_checkable
+class EstimatedSized(Protocol):
+    """Widget can estimate it's size.
+
+    PEP 424 defines API for memory-efficiency.
+    For the ListBox it's a sign of the limited body length.
+    The main use-case is lazy-load, where real length calculation is expensive.
+    """
+
+    def __length_hint__(self) -> int: ...
+
+
 class ListWalker(metaclass=signals.MetaSignals):  # pylint: disable=no-member, unsubscriptable-object
     # mixin not named as mixin
     signals: typing.ClassVar[list[str]] = ["modified"]
@@ -431,11 +444,18 @@ class ListBox(Widget, WidgetContainerMixin):
         )
         self.body = body
 
-    def __len__(self) -> int:
+    @property
+    def __len__(self) -> Callable[[], int]:
         if isinstance(self._body, Sized):
-            return len(self._body)
+            return self._body.__len__
         raise AttributeError(f"{self._body.__class__.__name__} is not Sized")
 
+    @property
+    def __length_hint__(self) -> Callable[[], int]:  # pylint: disable=invalid-length-hint-returned
+        if isinstance(self._body, (Sized, EstimatedSized)):
+            return lambda: operator.length_hint(self._body)
+        raise AttributeError(f'{self._body.__class__.__name__} is not Sized and do not implement "__length_hint__"')
+
     def calculate_visible(
         self,
         size: tuple[int, int],
@@ -577,9 +597,9 @@ class ListBox(Widget, WidgetContainerMixin):
         if not isinstance(self._body, ScrollSupportingBody):
             raise ListBoxError(f"{self} body do not implement methods required for scrolling protocol")
 
-        if not isinstance(self._body, (Sized, TreeWalker)):
+        if not isinstance(self._body, (Sized, EstimatedSized, TreeWalker)):
             raise ListBoxError(
-                f"{self} body is not a Sized and not a TreeWalker."
+                f"{self} body is not a Sized, can not estimate it's size and not a TreeWalker."
                 f"Scroll is not allowed due to risk of infinite cycle of widgets load."
             )
 
@@ -643,7 +663,7 @@ class ListBox(Widget, WidgetContainerMixin):
 
     def require_relative_scroll(self, size: tuple[int, int], focus: bool = False) -> bool:
         """Widget require relative scroll due to performance limitations of real lines count calculation."""
-        return isinstance(self._body, Sized) and (size[1] * 3 < len(self))
+        return isinstance(self._body, (Sized, EstimatedSized)) and (size[1] * 3 < operator.length_hint(self.body))
 
     def get_first_visible_pos(self, size: tuple[int, int], focus: bool = False) -> int:
         self._check_support_scrolling()

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

@@ -130,8 +130,6 @@ class SupportsScroll(WidgetProto, Protocol):
 class SupportsRelativeScroll(WidgetProto, Protocol):
     """Relative scroll-specific methods."""
 
-    def __len__(self) -> int: ...
-
     def require_relative_scroll(self, size: tuple[int, int], focus: bool = False) -> bool: ...
 
     def get_first_visible_pos(self, size: tuple[int, int], focus: bool = False) -> int: ...
@@ -516,18 +514,32 @@ class ScrollBar(WidgetDecoration[WrappedWidget]):
         ow = self._original_widget
         ow_base = self.scrolling_base_widget
 
-        if isinstance(ow, SupportsRelativeScroll) and ow.require_relative_scroll(size, focus):
-            if len(ow) == ow.get_visible_amount(size, focus):
-                # Canvas fits without scrolling - no scrollbar needed
-                return render_no_scrollbar()
+        # Use hasattr instead of protocol: hasattr will return False in case of getattr raise AttributeError
+        # Use __length_hint__ first since it's less resource intensive
+        use_relative = (
+            isinstance(ow_base, SupportsRelativeScroll)
+            and any(hasattr(ow_base, attrib) for attrib in ("__length_hint__", "__len__"))
+            and ow_base.require_relative_scroll(size, focus)
+        )
 
+        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_canv = render_for_scrollbar()
-            visible_amount = ow.get_visible_amount(ow_size, focus)
+            visible_amount = ow_base.get_visible_amount(ow_size, focus)
             pos = ow_base.get_first_visible_pos(ow_size, focus)
-            posmax = len(ow) - visible_amount
-            thumb_weight = min(1.0, visible_amount / max(1, len(ow)))
 
-        else:
+            # in the case of estimated length, it can be smaller than real widget length
+            ow_len = max(ow_len, visible_amount, pos)
+            posmax = ow_len - visible_amount
+            thumb_weight = min(1.0, visible_amount / max(1, ow_len))
+
+            if ow_len == visible_amount:
+                # Corner case: formally all contents indexes should be visible, but this does not mean all rows
+                use_relative = False
+
+        if not use_relative:
             ow_rows_max = ow_base.rows_max(size, focus)
             if ow_rows_max <= maxrow:
                 # Canvas fits without scrolling - no scrollbar needed

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-2.6.9.dist-info → urwid-2.6.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.9
+Version: 2.6.11
 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.9.dist-info → urwid-2.6.11.dist-info}/RECORD

@@ -11,7 +11,7 @@ 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=muQ56uz1uuUGvBY5I4hh-zAqE-_w_qyq9Go2a181wWs,411
+urwid/version.py,sha256=xlDSe3Xh6QX74LV4NLD5AhuGgpD8erExdJU0ZVYLBLM,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
@@ -53,22 +53,22 @@ urwid/widget/filler.py,sha256=EEnyAawdKXuwf79pErfNuvqsU1SVTutcMUrwWkU4wfo,14665
 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=54DrfJhT9MgSyakz_9ODEx1uAIyR47ax0-PYr4bVC1c,73579
-urwid/widget/monitored_list.py,sha256=8lBb8kowLAqKMKByiBZp4jt9PSnXjYAoAjXFXm-7xcg,18773
+urwid/widget/listbox.py,sha256=EaGo13fpt4Oy9V00n27U-2PhOWa7-nmsTgnddKv9GII,74392
+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=vQ0dNMo3G0QAXShhU0E4pn7umdIre43nKi-R_Zjeenk,23490
+urwid/widget/scrollable.py,sha256=yB3S3k5dOdZ-wrQMlgxQH-1AZONSf5X6Y2accIa9tpk,24279
 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.py,sha256=A0ZjvDjLqhdzelPFC96Ozo1voIoGkxftNmJh8X1IyNI,29557
 urwid/widget/widget_decoration.py,sha256=aHP9Y7JKVCI2dw2OdRrzMj9p--C1pMIbxSJskWBLIgc,5633
 urwid/widget/wimp.py,sha256=4wfzTQBLMbhicSlL64hBPb-1W5FAFrIKfb43i10MKSY,27305
-urwid-2.6.9.dist-info/COPYING,sha256=NrbT-keRaUP9X-wxPFhHhJRgR-wTN6eLRA5ZkstZX4k,26434
-urwid-2.6.9.dist-info/METADATA,sha256=nuNLnSVXGabLOUoJz-XzAQV27vwKfYpoqfiHwlfCztc,11042
-urwid-2.6.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-urwid-2.6.9.dist-info/top_level.txt,sha256=AwxQA43kNkjHbhYELXHBKrQ01X5CR2KnDzU07cVqilY,6
-urwid-2.6.9.dist-info/RECORD,,
+urwid-2.6.11.dist-info/COPYING,sha256=NrbT-keRaUP9X-wxPFhHhJRgR-wTN6eLRA5ZkstZX4k,26434
+urwid-2.6.11.dist-info/METADATA,sha256=BdPqGaA0WgGq3ISj7YQYEMzmQKAGoFn6OBAVpJE1Fl0,11043
+urwid-2.6.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+urwid-2.6.11.dist-info/top_level.txt,sha256=AwxQA43kNkjHbhYELXHBKrQ01X5CR2KnDzU07cVqilY,6
+urwid-2.6.11.dist-info/RECORD,,