urwid 2.6.9__tar.gz → 2.6.10__tar.gz

urwid-2.6.10/.editorconfig

@@ -0,0 +1,22 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{py,pyi,pyx,pxd}]
+indent_size = 4
+max_line_length = 120
+
+[*.{yml,yaml,json,ini,toml}]
+indent_size = 2
+max_line_length = 120
+
+[*.{rst,md}]
+indent_size = 2
+
+[{Makefile,Makefile.in}]
+indent_style = tab

{urwid-2.6.9 → urwid-2.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.9
+Version: 2.6.10
 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/black-requirements.txt

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

{urwid-2.6.9 → urwid-2.6.10}/docs/examples/real_browse.py

@@ -274,7 +274,14 @@ class DirectoryBrowser:
         self.listbox.offset_rows = 1
         self.footer = urwid.AttrMap(urwid.Text(self.footer_text), "foot")
         self.view = urwid.Frame(
-            urwid.AttrMap(urwid.ScrollBar(self.listbox), "body"),
+            urwid.AttrMap(
+                urwid.ScrollBar(
+                    self.listbox,
+                    thumb_char=urwid.ScrollBar.Symbols.FULL_BLOCK,
+                    trough_char=urwid.ScrollBar.Symbols.LITE_SHADE,
+                ),
+                "body",
+            ),
             header=urwid.AttrMap(self.header, "head"),
             footer=self.footer,
         )
@@ -379,9 +386,9 @@ def escape_filename_sh_ansic(name: str) -> str:
 SPLIT_RE = re.compile(r"[a-zA-Z]+|\d+")
 
 
-def alphabetize(s):
+def alphabetize(s: str) -> list[str]:
     L = []
-    for isdigit, group in itertools.groupby(SPLIT_RE.findall(s), key=lambda x: x.isdigit()):
+    for isdigit, group in itertools.groupby(SPLIT_RE.findall(s), key=str.isdigit):
         if isdigit:
             L.extend(("", int(n)) for n in group)
         else:

{urwid-2.6.9 → urwid-2.6.10}/examples/browse.py

@@ -274,7 +274,14 @@ class DirectoryBrowser:
         self.listbox.offset_rows = 1
         self.footer = urwid.AttrMap(urwid.Text(self.footer_text), "foot")
         self.view = urwid.Frame(
-            urwid.AttrMap(urwid.ScrollBar(self.listbox), "body"),
+            urwid.AttrMap(
+                urwid.ScrollBar(
+                    self.listbox,
+                    thumb_char=urwid.ScrollBar.Symbols.FULL_BLOCK,
+                    trough_char=urwid.ScrollBar.Symbols.LITE_SHADE,
+                ),
+                "body",
+            ),
             header=urwid.AttrMap(self.header, "head"),
             footer=self.footer,
         )
@@ -379,9 +386,9 @@ def escape_filename_sh_ansic(name: str) -> str:
 SPLIT_RE = re.compile(r"[a-zA-Z]+|\d+")
 
 
-def alphabetize(s):
+def alphabetize(s: str) -> list[str]:
     L = []
-    for isdigit, group in itertools.groupby(SPLIT_RE.findall(s), key=lambda x: x.isdigit()):
+    for isdigit, group in itertools.groupby(SPLIT_RE.findall(s), key=str.isdigit):
         if isdigit:
             L.extend(("", int(n)) for n in group)
         else:

{urwid-2.6.9 → urwid-2.6.10}/pyproject.toml

@@ -2,9 +2,9 @@
 # Minimum requirements for the build system to execute.
 # PEP 508 specifications for PEP 518.
 requires = [
-    "setuptools >= 61.0.0",
-    "setuptools_scm[toml]>=7.0",
-    "wheel",
+  "setuptools >= 61.0.0",
+  "setuptools_scm[toml]>=7.0",
+  "wheel",
 ]
 build-backend="setuptools.build_meta"
 
@@ -179,7 +179,7 @@ extend-select = [
 ]
 extend-ignore = [
   "PLR6301", "E203",
-    # refactor rules (too many statements/arguments/branches)
+  # refactor rules (too many statements/arguments/branches)
   "PLR0904", "PLR0911", "PLR0912", "PLR0913", "PLR0914", "PLR0915", "PLR0917", "PLR2004",
   "PLC0415",  # We have a lot of imports outside of top-level
   "RET504",  # Unnecessary variable assignment before return statement

urwid-2.6.10/ruff-requirements.txt

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

{urwid-2.6.9 → urwid-2.6.10}/tests/test_scrollable.py

@@ -1,10 +1,14 @@
 from __future__ import annotations
 
 import string
+import typing
 import unittest
 
 import urwid
 
+if typing.TYPE_CHECKING:
+    from collections.abc import Iterable
+
 LGPL_HEADER = """
 Copyright (C) <year>  <name of author>
 
@@ -264,15 +268,13 @@ class TestScrollBarListBox(unittest.TestCase):
 
         widget.keypress(reduced_size, "end")
 
-        # Here we have ListBox issue: "end" really scroll not to the "dead end"
-        # in case of the bottom focus position is multiline
         self.assertEqual(
             (
-                "GNU Lesser General Public               ",
                 "License along with this library; if     ",
                 "not, write to the Free Software         ",
                 "Foundation, Inc., 51 Franklin Street,   ",
-                "Fifth Floor, Boston, MA  02110-1301    █",
+                "Fifth Floor, Boston, MA  02110-1301     ",
+                "USA                                    █",
             ),
             widget.render(reduced_size).decoded_text,
         )
@@ -344,3 +346,54 @@ class TestScrollBarListBox(unittest.TestCase):
         widget.keypress(reduced_size, "down")
 
         self.assertEqual(pos_1_down_rendered, widget.render(reduced_size).decoded_text)
+
+    def test_hinted_len(self):
+        class HintedWalker(urwid.ListWalker):
+            def __init__(self, items: Iterable[str]) -> None:
+                self.items: tuple[str] = tuple(items)
+                self.focus = 0
+                self.requested_numbers: set[int] = set()
+
+            def __length_hint__(self) -> int:
+                return len(self.items)
+
+            def __getitem__(self, item: int) -> urwid.Text:
+                self.requested_numbers.add(item)
+                return urwid.Text(self.items[item])
+
+            def set_focus(self, item: int) -> None:
+                self.focus = item
+
+            def next_position(self, position: int) -> int:
+                if position + 1 < len(self.items):
+                    return position + 1
+                raise IndexError
+
+            def prev_position(self, position: int) -> int:
+                if position - 1 >= 0:
+                    return position - 1
+                raise IndexError
+
+        widget = urwid.ScrollBar(urwid.ListBox(HintedWalker((f"Line {idx:02}") for idx in range(1, 51))))
+        size = (10, 10)
+        widget.original_widget.focus_position = 19
+        self.assertEqual(
+            (
+                "Line 16   ",
+                "Line 17   ",
+                "Line 18   ",
+                "Line 19  █",
+                "Line 20  █",
+                "Line 21   ",
+                "Line 22   ",
+                "Line 23   ",
+                "Line 24   ",
+                "Line 25   ",
+            ),
+            widget.render(size).decoded_text,
+        )
+        self.assertNotIn(
+            30,
+            widget.original_widget.body.requested_numbers,
+            "Requested index out of range [0, last shown]. This means not relative scroll bar built.",
+        )

{urwid-2.6.9 → urwid-2.6.10}/tox.ini

@@ -7,8 +7,8 @@ usedevelop = true
 deps = -r {toxinidir}/test_requirements.txt
 
 commands =
-    coverage run -m unittest discover -s tests -v
-    coverage report
+  coverage run -m unittest discover -s tests -v
+  coverage report
 
 [testenv:readme]
 deps =
@@ -21,7 +21,7 @@ commands =
 [testenv:isort]
 skip_install = true
 deps =
-    isort
+  isort
 commands =
   isort .
 
@@ -41,18 +41,18 @@ commands = ruff check .
 
 [testenv:docs]
 deps =
-    -r {toxinidir}/test_requirements.txt
-    PyGObject
-    sphinx
-    sphinx-github-changelog
+  -r {toxinidir}/test_requirements.txt
+  PyGObject
+  sphinx
+  sphinx-github-changelog
 commands = sphinx-build docs/ build/documentation
 
 [testenv:pylint]
 depends = black,isort
 deps =
-    -r {toxinidir}/test_requirements.txt
-    PyGObject
-    pylint
+  -r {toxinidir}/test_requirements.txt
+  PyGObject
+  pylint
 commands = pylint urwid
 
 [testenv:refurb]

{urwid-2.6.9 → urwid-2.6.10}/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.10'
+__version_tuple__ = version_tuple = (2, 6, 10)

{urwid-2.6.9 → urwid-2.6.10}/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-2.6.9 → urwid-2.6.10}/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-2.6.9 → urwid-2.6.10}/urwid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.9
+Version: 2.6.10
 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 → urwid-2.6.10}/urwid.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 .coveralls.yml
 .dockerignore
+.editorconfig
 .gitignore
 .pre-commit-config.yaml
 .yamllint.yml

urwid-2.6.9/black-requirements.txt

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

urwid-2.6.9/ruff-requirements.txt

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