urwid 2.6.8__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.8 → urwid-2.6.10}/.pre-commit-config.yaml

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.8
+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.8 → urwid-2.6.10}/docs/conf.py

@@ -226,11 +226,11 @@ htmlhelp_basename = "Urwiddoc"
 
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
+    # 'papersize': 'letterpaper',
     # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
+    # 'pointsize': '10pt',
     # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+    # 'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples

{urwid-2.6.8 → 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(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.8 → urwid-2.6.10}/docs/tutorial/highcolors.py

@@ -4,7 +4,7 @@ import urwid
 
 
 def exit_on_q(key):
-    if key in ("q", "Q"):
+    if key in {"q", "Q"}:
         raise urwid.ExitMainLoop()
 
 

{urwid-2.6.8 → urwid-2.6.10}/docs/tutorial/input.py

@@ -4,7 +4,7 @@ import urwid
 
 
 def show_or_exit(key: str) -> None:
-    if key in ("q", "Q"):
+    if key in {"q", "Q"}:
         raise urwid.ExitMainLoop()
     txt.set_text(repr(key))
 

{urwid-2.6.8 → urwid-2.6.10}/docs/tutorial/qa.py

@@ -4,7 +4,7 @@ import urwid
 
 
 def exit_on_q(key: str) -> None:
-    if key in ("q", "Q"):
+    if key in {"q", "Q"}:
         raise urwid.ExitMainLoop()
 
 

{urwid-2.6.8 → urwid-2.6.10}/docs/tutorial/urwid_attr.py

@@ -4,7 +4,7 @@ import urwid
 
 
 def exit_on_q(key: str) -> None:
-    if key in ("q", "Q"):
+    if key in {"q", "Q"}:
         raise urwid.ExitMainLoop()
 
 

{urwid-2.6.8 → 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(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.8 → urwid-2.6.10}/examples/twisted_serve_ssh.py

@@ -201,7 +201,7 @@ class TwistedScreen(Screen):
         tuples. This very simple implementation iterates each row and simply
         writes it out.
         """
-        (maxcol, maxrow) = size
+        (_maxcol, _maxrow) = size
         # self.terminal.eraseDisplay()
         lasta = None
         for i, row in enumerate(canvas.content()):
@@ -400,7 +400,7 @@ class UrwidTerminalSession(TerminalSession):
 
     def windowChanged(self, dimensions):
         """Called when the window size has changed."""
-        (h, w, x, y) = dimensions
+        (h, w, _x, _y) = dimensions
         self.chained_protocol.terminalProtocol.terminalSize(h, w)
 
 

{urwid-2.6.8 → 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"
 
@@ -178,8 +178,8 @@ extend-select = [
   "TRY", "UP", "I", "PL", "PERF", "RUF",  # tryceratops, pyupgrade, isort, pylint + perflint, Ruff-specific
 ]
 extend-ignore = [
-  "PLR6301", "E203", "PLW3201",
-    # refactor rules (too many statements/arguments/branches)
+  "PLR6301", "E203",
+  # 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
@@ -197,6 +197,15 @@ known-third-party = []
 [tool.ruff.lint.pydocstyle]
 convention = "pep257"
 
+[tool.ruff.lint.pylint]
+allow-dunder-method-names = [
+  "__rich_repr__",
+  # class generation
+  "_contents__getitem__",
+  "_contents__setitem__",
+  "_contents__delitem__",
+]
+
 [tool.pylint]
 extension-pkg-whitelist = []
 ignore = ["CVS", "_version.py"]
@@ -236,8 +245,6 @@ disable = [
   "broad-exception-raised",
   "logging-fstring-interpolation",
   "logging-format-interpolation",
-  "consider-alternative-union-syntax",
-  "deprecated-typing-alias",
   "fixme",
   "invalid-name",
   "import-outside-toplevel",
@@ -247,7 +254,6 @@ disable = [
   "unused-argument",
   "unused-private-member",
   "arguments-differ",
-  "consider-alternative-union-syntax",
   "consider-using-assignment-expr",
   "superfluous-parens",
   # Magic part

urwid-2.6.10/ruff-requirements.txt

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

{urwid-2.6.8 → 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>
 
@@ -192,9 +196,28 @@ class TestScrollBarScrollable(unittest.TestCase):
         with self.assertRaises(TypeError):
             urwid.ScrollBar(urwid.SolidFill(" "))
 
+    def test_no_scrollbar(self):
+        """If widget fit without scroll - no scrollbar needed"""
+        widget = urwid.ScrollBar(
+            urwid.Scrollable(urwid.BigText("1", urwid.HalfBlockHeavy6x5Font())),
+            trough_char=urwid.ScrollBar.Symbols.LITE_SHADE,
+            thumb_char=urwid.ScrollBar.Symbols.DARK_SHADE,
+        )
+        reduced_size = (8, 5)
+        self.assertEqual(
+            (
+                " ▐█▌    ",
+                " ▀█▌    ",
+                "  █▌    ",
+                "  █▌    ",
+                " ███▌   ",
+            ),
+            widget.render(reduced_size).decoded_text,
+        )
+
 
 class TestScrollBarListBox(unittest.TestCase):
-    def test_non_selectable(self):
+    def test_relative_non_selectable(self):
         widget = urwid.ScrollBar(
             urwid.ListBox(urwid.SimpleListWalker(urwid.Text(line) for line in LGPL_HEADER.splitlines()))
         )
@@ -323,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.8 → 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.8 → urwid-2.6.10}/urwid/display/escape.py

@@ -310,17 +310,15 @@ class KeyqueueTrie:
 
         (b, x, y) = (int(val) for val in value[:-1].split(";"))
         action = value[-1]
-
-        # shift, etc. is not communicated on my machine, so I
-        # can't and won't be able to add support for it.
-        # Double and triple clicks are not supported as well. They can be
-        # implemented by using a timer. This timer can check if the last
-        # registered click is below a certain threshold. This threshold
-        # is normally set in the operating system itself, so setting one
-        # here will cause an inconsistent behaviour. I do not plan to use
-        # that feature, so I won't implement it.
+        # Double and triple clicks are not supported.
+        # They can be implemented by using a timer.
+        # This timer can check if the last registered click is below a certain threshold.
+        # This threshold is normally set in the operating system itself,
+        # so setting one here will cause an inconsistent behaviour.
 
         prefixes = []
+        if b & 4:
+            prefixes.append("shift ")
         if b & 8:
             prefixes.append("meta ")
         if b & 16:

{urwid-2.6.8 → urwid-2.6.10}/urwid/event_loop/asyncio_loop.py

@@ -222,9 +222,10 @@ class AsyncioEventLoop(EventLoop):
             loop.default_exception_handler(context)
 
     def run(self) -> None:
-        """
-        Start the event loop.  Exit the loop when any callback raises
-        an exception.  If ExitMainLoop is raised, exit cleanly.
+        """Start the event loop.
+
+        Exit the loop when any callback raises an exception.
+        If ExitMainLoop is raised, exit cleanly.
         """
         self._loop.set_exception_handler(self._exception_handler)
         self._loop.run_forever()

{urwid-2.6.8 → urwid-2.6.10}/urwid/event_loop/trio_loop.py

@@ -160,9 +160,10 @@ class TrioEventLoop(EventLoop):
             trio.run(self._main_task, instruments=[emulate_idle_callbacks])
 
     async def run_async(self) -> None:
-        """Starts the main loop and blocks asynchronously until the main loop
-        exits. This allows one to embed an urwid app in a Trio app even if the
-        Trio event loop is already running. Example::
+        """Starts the main loop and blocks asynchronously until the main loop exits.
+
+        This allows one to embed an urwid app in a Trio app even if the Trio event loop is already running.
+        Example::
 
             with trio.open_nursery() as nursery:
                 event_loop = urwid.TrioEventLoop()

{urwid-2.6.8 → 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.8'
-__version_tuple__ = version_tuple = (2, 6, 8)
+__version__ = version = '2.6.10'
+__version_tuple__ = version_tuple = (2, 6, 10)