urwid 3.0.2__py3-none-any.whl → 3.0.3__py3-none-any.whl

urwid/canvas.py

@@ -84,7 +84,7 @@ class CanvasCache:
     cleanups = 0
 
     @classmethod
-    def store(cls, wcls, canvas: Canvas) -> None:
+    def store(cls, wcls: type[Widget], canvas: Canvas) -> None:
         """
         Store a weakref to canvas in the cache.
 
@@ -98,7 +98,7 @@ class CanvasCache:
             raise TypeError("Can't store canvas without widget_info")
         widget, size, focus = canvas.widget_info
 
-        def walk_depends(canv):
+        def walk_depends(canv: Canvas) -> list[Widget]:
             """
             Collect all child widgets for determining who we
             depend on.
@@ -128,7 +128,7 @@ class CanvasCache:
         cls._widgets.setdefault(widget, {})[wcls, size, focus] = ref
 
     @classmethod
-    def fetch(cls, widget, wcls, size, focus) -> Canvas | None:
+    def fetch(cls, widget: Widget, wcls: type[Widget], size, focus: bool) -> Canvas | None:
         """
         Return the cached canvas or None.
 
@@ -150,7 +150,7 @@ class CanvasCache:
         return canv
 
     @classmethod
-    def invalidate(cls, widget):
+    def invalidate(cls, widget: Widget) -> None:
         """
         Remove all canvases cached for widget.
         """
@@ -214,7 +214,7 @@ class Canvas:
 
     def __init__(self) -> None:
         """Base Canvas class"""
-        self._widget_info = None
+        self._widget_info: tuple[Widget, tuple[[]] | tuple[int] | tuple[int, int], bool] | None = None
         self.coords: dict[str, tuple[int, int, tuple[Widget, int, int]] | tuple[int, int, None]] = {}
         self.shortcuts: dict[str, str] = {}
 
@@ -240,7 +240,7 @@ class Canvas:
         self._widget_info = widget, size, focus
 
     @property
-    def widget_info(self):
+    def widget_info(self) -> tuple[Widget, tuple[[]] | tuple[int] | tuple[int, int], bool] | None:
         return self._widget_info
 
     @property

urwid/display/_posix_raw_display.py

@@ -154,7 +154,7 @@ class Screen(_raw_display_base.Screen):
         if not os.environ.get("TERM", "").lower().startswith("linux"):
             return
 
-        m = Popen(  # noqa: S603  # pylint: disable=consider-using-with
+        m = Popen(  # pylint: disable=consider-using-with
             ["/usr/bin/mev", "-e", "158"],
             stdin=PIPE,
             stdout=PIPE,
@@ -175,7 +175,7 @@ class Screen(_raw_display_base.Screen):
         """
         Initialize the screen and input mode.
 
-        alternate_buffer -- use alternate screen buffer
+        alternate_buffer -- use an alternate screen buffer
         """
         if alternate_buffer:
             self.write(escape.SWITCH_TO_ALTERNATE_BUFFER)
@@ -403,8 +403,8 @@ class Screen(_raw_display_base.Screen):
         y, x = super().get_cols_rows()
         with contextlib.suppress(OSError):  # Term size could not be determined
             if hasattr(self._term_output_file, "fileno"):
-                buf = fcntl.ioctl(self._term_output_file.fileno(), termios.TIOCGWINSZ, b" " * 4)
-                y, x = struct.unpack("hh", buf)
+                buf = fcntl.ioctl(self._term_output_file.fileno(), termios.TIOCGWINSZ, b" " * 8)
+                y, x, _, _ = struct.unpack("hhhh", buf)
 
         # Provide some lightweight fallbacks in case the TIOCWINSZ doesn't
         # give sane answers

urwid/display/_raw_display_base.py

@@ -211,7 +211,7 @@ class Screen(BaseScreen, RealTerminal):
         Restore the screen.
         """
 
-    def write(self, data):
+    def write(self, data: str) -> None:
         """Write some data to the terminal.
 
         You may wish to override this if you're using something other than
@@ -219,7 +219,7 @@ class Screen(BaseScreen, RealTerminal):
         """
         self._term_output_file.write(data)
 
-    def flush(self):
+    def flush(self) -> None:
         """Flush the output buffer.
 
         You may wish to override this if you're using something other than
@@ -352,7 +352,11 @@ class Screen(BaseScreen, RealTerminal):
 
     _input_timeout = None
 
-    def _make_legacy_input_wrapper(self, event_loop, callback):
+    def _make_legacy_input_wrapper(
+        self,
+        event_loop: EventLoop,
+        callback: Callable[[list[str], list[int]], typing.Any],
+    ) -> Callable[[], None]:
         """
         Support old Screen classes that still have a get_input_nonblocking and expect it to work.
         """
@@ -873,9 +877,8 @@ class Screen(BaseScreen, RealTerminal):
 
     def reset_default_terminal_palette(self) -> None:
         """
-        Attempt to set the terminal palette to default values as taken
-        from xterm.  Uses number of colors from current
-        set_terminal_properties() screen setting.
+        Attempt to set the terminal palette to default values as taken from xterm.
+        Uses a number of colors from the current set_terminal_properties() screen setting.
         """
         if self.colors == 1:
             return
@@ -898,9 +901,8 @@ class Screen(BaseScreen, RealTerminal):
         """
         entries - list of (index, red, green, blue) tuples.
 
-        Attempt to set part of the terminal palette (this does not work
-        on all terminals.)  The changes are sent as a single escape
-        sequence so they should all take effect at the same time.
+        Attempt to set part of the terminal palette (this does not work on all terminals.)
+        The changes are sent as a single escape sequence so they should all take effect at the same time.
 
         0 <= index < 256 (some terminals will only have 16 or 88 colors)
         0 <= red, green, blue < 256

urwid/display/common.py

@@ -768,7 +768,7 @@ class AttrSpec:
             else:
                 scolor = _parse_color_256(_true_to_256(part) or part)
                 flags |= _FG_HIGH_COLOR
-            # _parse_color_*() return None for unrecognised colors
+            # _parse_color_*() return None for unrecognized colors
             if scolor is None:
                 raise AttrSpecError(f"Unrecognised color specification {part!r} in foreground ({foreground!r})")
             if color is not None:
@@ -1011,7 +1011,7 @@ class BaseScreen(abc.ABC, metaclass=signals.MetaSignals):
     def _stop(self) -> None:
         pass
 
-    def run_wrapper(self, fn, *args, **kwargs):
+    def run_wrapper(self, fn, *args, **kwargs) -> None:
         """Start the screen, call a function, then stop the screen.  Extra
         arguments are passed to `start`.
 

urwid/display/curses.py

@@ -596,7 +596,7 @@ class Screen(BaseScreen, RealTerminal):
                             raise TypeError(seg)
                         self.s.addstr(seg.decode(util.get_encoding()))
                 except curses.error:
-                    # it's ok to get out of the
+                    # it's OK to get out of the
                     # screen on the lower right
                     if y != rows - 1 or nr != len(row) - 1:
                         # perhaps screen size changed

urwid/display/escape.py

@@ -247,7 +247,11 @@ class KeyqueueTrie:
             return None
         return self.get_recurse(root[keys[0]], keys[1:], more_available)
 
-    def read_mouse_info(self, keys: Sequence[int], more_available: bool):
+    def read_mouse_info(
+        self,
+        keys: Sequence[int],
+        more_available: bool,
+    ) -> tuple[tuple[str, int, int, int], Sequence[int]] | None:
         if len(keys) < 3:
             if more_available:
                 raise MoreInputRequired()
@@ -286,7 +290,11 @@ class KeyqueueTrie:
 
         return ((f"{prefix}mouse {action}", button, x, y), keys[3:])
 
-    def read_sgrmouse_info(self, keys: Sequence[int], more_available: bool):
+    def read_sgrmouse_info(
+        self,
+        keys: Sequence[int],
+        more_available: bool,
+    ) -> tuple[tuple[str, int, int, int], Sequence[int]] | None:
         # Helpful links:
         # https://stackoverflow.com/questions/5966903/how-to-get-mousemove-and-mouseclick-in-bash
         # http://invisible-island.net/xterm/ctlseqs/ctlseqs.pdf
@@ -345,7 +353,11 @@ class KeyqueueTrie:
 
         return ((f"{prefix}mouse {action}", button, x, y), keys[pos_m + 1 :])
 
-    def read_cursor_position(self, keys, more_available: bool):
+    def read_cursor_position(
+        self,
+        keys: Sequence[int],
+        more_available: bool,
+    ) -> tuple[tuple[str, int, int], Sequence[int]] | None:
         """
         Interpret cursor position information being sent by the
         user's terminal.  Returned as ('cursor position', x, y)

urwid/display/lcd.py

@@ -125,8 +125,8 @@ class CFLCDScreen(LCDScreen, abc.ABC):
 
     @classmethod
     def get_crc(cls, buf: Iterable[int]) -> bytes:
-        # This seed makes the output of this shift based algorithm match
-        # the table based algorithm. The center 16 bits of the 32-bit
+        # This seed makes the output of this shift-based algorithm match
+        # the table-based algorithm. The center 16 bits of the 32-bit
         # "newCRC" are used for the CRC. The MSB of the lower byte is used
         # to see what bit was shifted out of the center 16 bit CRC
         # accumulator ("carry flag analog");
@@ -229,7 +229,7 @@ class KeyRepeatSimulator:
     Provide simulated repeat key events when given press and
     release events.
 
-    If two or more keys are pressed disable repeating until all
+    If two or more keys are pressed, disable repeating until all
     keys are released.
     """
 
@@ -286,7 +286,7 @@ class CF635Screen(CFLCDScreen):
     20x4 character display + cursor
     no foreground/background colors or settings supported
 
-    see CGROM for list of close unicode matches to characters available
+    see CGROM for a list of close Unicode matches to characters available
 
     6 button input
     up, down, left, right, enter (check mark), exit (cross)

urwid/display/web.py

@@ -456,7 +456,7 @@ class Screen(BaseScreen):
         return pending_input
 
 
-def code_span(s, fg, bg, cursor=-1) -> str:
+def code_span(s: str, fg: str, bg: str, cursor: int = -1) -> str:
     code_fg = _code_colours[fg]
     code_bg = _code_colours[bg]
 
@@ -492,8 +492,8 @@ def is_web_request() -> bool:
 def handle_short_request() -> bool:
     """
     Handle short requests such as passing keystrokes to the application
-    or sending the initial html page.  If returns True, then this
-    function recognised and handled a short request, and the calling
+    or sending the initial HTML page.  If returns True, then this
+    function recognized and handled a short request, and the calling
     script should immediately exit.
 
     web_display.set_preferences(..) should be called before calling this

urwid/version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '3.0.2'
-__version_tuple__ = version_tuple = (3, 0, 2)
+__version__ = version = '3.0.3'
+__version_tuple__ = version_tuple = (3, 0, 3)
+
+__commit_id__ = commit_id = None

urwid/widget/listbox.py

@@ -1017,6 +1017,9 @@ class ListBox(Widget, WidgetContainerMixin):
         self._body.set_focus(focus_pos)
 
         middle, top, bottom = self.calculate_visible((maxcol, maxrow), focus)
+        if middle is None:
+            return None
+
         focus_offset, _focus_widget, focus_pos, focus_rows, _cursor = middle  # pylint: disable=unpacking-non-sequence
         _trim_top, fill_above = top  # pylint: disable=unpacking-non-sequence
         _trim_bottom, fill_below = bottom  # pylint: disable=unpacking-non-sequence

{urwid-3.0.2.dist-info → urwid-3.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 3.0.2
+Version: 3.0.3
 Summary: A full-featured console (xterm et al.) user interface library
 Author-email: Ian Ward <ian@excess.org>
 License: LGPL-2.1-only
@@ -104,6 +104,8 @@ Alternatively if you are on Debian or Ubuntu
 Windows support notes
 =====================
 
+Windows support is limited to the Windows 10+ due to ANSI support requirement.
+
 * Not supported:
 
 1. Terminal widget and all related render API (TermCanvas, TermCharset, TermModes, TermScroller)

{urwid-3.0.2.dist-info → urwid-3.0.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 urwid/__init__.py,sha256=t5n8QWni3FbasOyKIulm_7-Go3A0puBKiie_79rxifU,7979
-urwid/canvas.py,sha256=mHwPJ494ivdhm_06d5rJzTR9cB_aYLDCz6RAzzHl8L0,46092
+urwid/canvas.py,sha256=W6gVxeuC2PiLo8U5suNPZ7BpamfC_Y_-1HU2_PKWGA0,46316
 urwid/command_map.py,sha256=UUOC11O0SlNhMiBoYqNaSAfGcg0RmjjGEgz6Xt96iA4,4369
 urwid/container.py,sha256=WOodISzyS4NSs3arijXuXLsDvF1GVIn4ufcPzfxSkdA,1594
 urwid/decoration.py,sha256=dwoYY0tiZS4toGgrxEAALKeVvnoDV9W-LadkV9G4CZg,1777
@@ -11,23 +11,23 @@ urwid/split_repr.py,sha256=pXzuddzQ4RnfIl537Gvoe8PVaBRHCPnxgdYvKK0qm8k,3899
 urwid/str_util.py,sha256=oQVTyDWAIRuCsNl_jeAxX1zbldWgU58MMU3YPWKlFbA,10823
 urwid/text_layout.py,sha256=EqsT64CUfP_QPTnhyVy4erEhXaCShxGqynBm6xS5qpI,22792
 urwid/util.py,sha256=cZ2qtutEThZSq4FGu3DMX2Tds0CXXRghn8b8QQasR7w,15337
-urwid/version.py,sha256=NpXuePaG57YwfLkFhnPEM1yLuLWOsEkvJLB1sQvObCw,511
+urwid/version.py,sha256=BweWx3tNj_D6SQCX10T_zF5lEo_PhYQvGgQyCBC4gHM,704
 urwid/vterm.py,sha256=vzzgf1P8M5j6uEePSEMVhQVMzqGeVnJc1L6DZCH9kRg,57744
 urwid/wimp.py,sha256=CRpUWYsrCSrnTX1AH7FnBI_8EvLHHy6eypg8-zno5MI,572
 urwid/display/__init__.py,sha256=y90WbHPNRHlimPrXhzsSfFsBbBHy8QErmB1y4Xza-xo,1732
-urwid/display/_posix_raw_display.py,sha256=ExZHAzuJg34VNrWWVKXPZGFSApLJvJxrNh4detTEdCY,15053
-urwid/display/_raw_display_base.py,sha256=IVkgFhooYFZxuzXoP4OK1J_Uo3R9rxj7pUscrtz8UJM,33586
+urwid/display/_posix_raw_display.py,sha256=PcrTvzCsOkxnNJaNPBCn9ETjETPCIv3SWHLDauyVyb0,15050
+urwid/display/_raw_display_base.py,sha256=lHAgl51Ydd6Qkfs2-lXsNDIj8SXwxoYU6C0T90BfW1s,33705
 urwid/display/_web.css,sha256=6HarEsIspH2egt51HSrgI8Yl2lGi-DbziWOdS4RHNlk,359
 urwid/display/_web.js,sha256=aWEOQ4EsADsiNgdw-zHEUMCRD2bnfR8M1mu4dOc2Tqk,12947
 urwid/display/_win32.py,sha256=hD4hytElpfIv5qxGNTMSa2QeBNByqJDNVpmiiQSj6CM,5401
 urwid/display/_win32_raw_display.py,sha256=VL6TiUId1bI5jszxAyqrso2XBnyVIWM_GWMKvV5kbOw,9176
-urwid/display/common.py,sha256=w3w5qrxMV-2pBC1_SinluMWlmRzxm82GfDf_hrz0AF4,38564
-urwid/display/curses.py,sha256=Ba-CC-qC-K81ZHWyNhMm_2P4fJVbFI0kQFs0gp-SCc4,22748
-urwid/display/escape.py,sha256=DRFKs9rzfzk3aGsc8S3j_BJvNdETpQZyJN8cItetoaE,17913
+urwid/display/common.py,sha256=0qP5o2DoxfMt8OTs1HWLUgxxLV_YvWc6GPkNn0TlJ4M,38572
+urwid/display/curses.py,sha256=99JTuRlJt1bKt6b_1XK0hxJ88z0C8RDeXTWvdaqL3YE,22748
+urwid/display/escape.py,sha256=G8oImGhqW_Ye-woR8rxSMfqmX1D2nP2RugKKGLTbSHM,18190
 urwid/display/html_fragment.py,sha256=lQRqr-hTrknQyZTtzPDp9zr-TWOT4NcuSsusS-LXIOU,8547
-urwid/display/lcd.py,sha256=CB-CXS6clkbNCNTwSKSnssbSK794TL59nsRA82WbR4w,17601
+urwid/display/lcd.py,sha256=XwBmdtzegbSTk68VoaYloo4T5vgrs-vZBFOFjObp6oE,17604
 urwid/display/raw.py,sha256=TSkIEM6KnQHPmmpBkWKdirZOwVXhSV67k7hWmuuR2OY,1125
-urwid/display/web.py,sha256=pd8PjKskTomdSSuYFRxvJo_9oefdXuN0R2UA3UpIwpg,19129
+urwid/display/web.py,sha256=QvCfKxIrtlv2fTc95BSdFLCM2ny4OPX2UE16H83TQSs,19151
 urwid/event_loop/__init__.py,sha256=6di4AYD6HbCf6v5p0rZOoteKnM9U5tfk4NKcWMH4FV4,1199
 urwid/event_loop/abstract_loop.py,sha256=6Kkw3KCJ4ndiI2I1P8fPdtHzjuekRxUuvzFOiR0Myok,5494
 urwid/event_loop/asyncio_loop.py,sha256=V86z4ezyLOXh0c3rgJPr4P1W3jfN6gvTKowe8PqmcwI,9122
@@ -53,7 +53,7 @@ urwid/widget/filler.py,sha256=l8FzT6gitp7xK9cPN0f1fW1NxxAo43L_GEx1abh-LHc,14799
 urwid/widget/frame.py,sha256=yVwsImuPhOuL99-9q5tTU7_x3kZ5YyRtqBOgUOyAjAw,21492
 urwid/widget/grid_flow.py,sha256=sAKZv9l-a9B-9vjjqq5Z8iuoCRC1MFyRrZzUOXqzA_o,18549
 urwid/widget/line_box.py,sha256=oefB0GRfDafZAOUn1t193gBYdzc6Pz2T8whYfeq5TYA,7458
-urwid/widget/listbox.py,sha256=Sfp1Y6HZGDziknE-wn7eZ3GsGIgINKft8E_MINLnHuQ,73220
+urwid/widget/listbox.py,sha256=mKey9zeck9FZ6rHPy92kR9GOmsGrJU-ASW6WG0_4o20,73272
 urwid/widget/monitored_list.py,sha256=pMhWGqt0Du97wQwuOydN-tfoba3rvnTi56BDRskUD6M,19360
 urwid/widget/overlay.py,sha256=A0ypqnCtOSR_axmE0zHiUZfonY1-aRMbTiymYulYQNc,33319
 urwid/widget/padding.py,sha256=zz1fy4b0hWTpEjR4uDlJnzAbm-TuiUcDWM9IusubvN0,19853
@@ -67,8 +67,8 @@ urwid/widget/treetools.py,sha256=NehR7ELL2vvBHIlwtRCGyTfPLdx0Uis5opufC3xNkcE,170
 urwid/widget/widget.py,sha256=uWHGpOueiDa8wJykFhR38wHV9Wg59E2lENDrWZZm9xI,26432
 urwid/widget/widget_decoration.py,sha256=zqB41ytmZo8-kSp4iurx06ax-t_IEI9GLbEzn7ZdqsU,4621
 urwid/widget/wimp.py,sha256=4wfzTQBLMbhicSlL64hBPb-1W5FAFrIKfb43i10MKSY,27305
-urwid-3.0.2.dist-info/licenses/COPYING,sha256=NrbT-keRaUP9X-wxPFhHhJRgR-wTN6eLRA5ZkstZX4k,26434
-urwid-3.0.2.dist-info/METADATA,sha256=UywRFdnHl-6jpdUO8zwoScmkYQE5rV7Lt10xoUjYLCs,10965
-urwid-3.0.2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-urwid-3.0.2.dist-info/top_level.txt,sha256=AwxQA43kNkjHbhYELXHBKrQ01X5CR2KnDzU07cVqilY,6
-urwid-3.0.2.dist-info/RECORD,,
+urwid-3.0.3.dist-info/licenses/COPYING,sha256=NrbT-keRaUP9X-wxPFhHhJRgR-wTN6eLRA5ZkstZX4k,26434
+urwid-3.0.3.dist-info/METADATA,sha256=YbyXgmjzUvsmXqnsa0EE_hRsmiagNm_tEz-pU07Slyw,11045
+urwid-3.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+urwid-3.0.3.dist-info/top_level.txt,sha256=AwxQA43kNkjHbhYELXHBKrQ01X5CR2KnDzU07cVqilY,6
+urwid-3.0.3.dist-info/RECORD,,

{urwid-3.0.2.dist-info → urwid-3.0.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any