urwid 2.6.6__py3-none-any.whl → 2.6.7__py3-none-any.whl

urwid/event_loop/main_loop.py

@@ -190,7 +190,7 @@ class MainLoop:
         else:
             self._topmost_widget = self._widget
 
-    def _set_pop_ups(self, pop_ups) -> None:
+    def _set_pop_ups(self, pop_ups: bool) -> None:
         warnings.warn(
             f"method `{self.__class__.__name__}._set_pop_ups` is deprecated, "
             f"please use `{self.__class__.__name__}.pop_ups` property",
@@ -214,7 +214,7 @@ class MainLoop:
         """
         self.logger.debug(f"Setting alarm in {sec!r} seconds with callback {callback!r}")
 
-        def cb():
+        def cb() -> None:
             callback(self, user_data)
 
         return self.event_loop.alarm(sec, cb)
@@ -236,7 +236,7 @@ class MainLoop:
         sec = tm - time.time()
         self.logger.debug(f"Setting alarm in {sec!r} seconds with callback {callback!r}")
 
-        def cb():
+        def cb() -> None:
             callback(self, user_data)
 
         return self.event_loop.alarm(sec, cb)
@@ -250,33 +250,28 @@ class MainLoop:
 
     if not IS_WINDOWS:
 
-        def watch_pipe(self, callback: Callable[[bytes], bool]) -> int:
+        def watch_pipe(self, callback: Callable[[bytes], bool | None]) -> int:
             """
             Create a pipe for use by a subprocess or thread to trigger a callback
             in the process/thread running the main loop.
 
-            :param callback: function taking one parameter to call from within
-                             the process/thread running the main loop
+            :param callback: function taking one parameter to call from within the process/thread running the main loop
             :type callback: callable
 
-            This method returns a file descriptor attached to the write end of a
-            pipe. The read end of the pipe is added to the list of files
-            :attr:`event_loop` is watching. When data is written to the pipe the
-            callback function will be called and passed a single value containing
-            data read from the pipe.
+            This method returns a file descriptor attached to the write end of a pipe.
+            The read end of the pipe is added to the list of files :attr:`event_loop` is watching.
+            When data is written to the pipe the callback function will be called
+            and passed a single value containing data read from the pipe.
 
-            This method may be used any time you want to update widgets from
-            another thread or subprocess.
+            This method may be used any time you want to update widgets from another thread or subprocess.
 
-            Data may be written to the returned file descriptor with
-            ``os.write(fd, data)``. Ensure that data is less than 512 bytes (or 4K
-            on Linux) so that the callback will be triggered just once with the
-            complete value of data passed in.
+            Data may be written to the returned file descriptor with ``os.write(fd, data)``.
+            Ensure that data is less than 512 bytes (or 4K on Linux)
+            so that the callback will be triggered just once with the complete value of data passed in.
 
-            If the callback returns ``False`` then the watch will be removed from
-            :attr:`event_loop` and the read end of the pipe will be closed. You
-            are responsible for closing the write end of the pipe with
-            ``os.close(fd)``.
+            If the callback returns ``False`` then the watch will be removed from :attr:`event_loop`
+            and the read end of the pipe will be closed.
+            You are responsible for closing the write end of the pipe with ``os.close(fd)``.
             """
             import fcntl
 
@@ -286,7 +281,7 @@ class MainLoop:
 
             def cb() -> None:
                 data = os.read(pipe_rd, PIPE_BUFFER_READ_SIZE)
-                if not callback(data):
+                if callback(data) is False:
                     self.event_loop.remove_watch_file(watch_handle)
                     os.close(pipe_rd)
 
@@ -296,9 +291,9 @@ class MainLoop:
 
         def remove_watch_pipe(self, write_fd: int) -> bool:
             """
-            Close the read end of the pipe and remove the watch created by
-            :meth:`watch_pipe`. You are responsible for closing the write end of
-            the pipe.
+            Close the read end of the pipe and remove the watch created by :meth:`watch_pipe`.
+
+            ..note:: You are responsible for closing the write end of the pipe.
 
             Returns ``True`` if the watch pipe exists, ``False`` otherwise
             """

urwid/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.6'
-__version_tuple__ = version_tuple = (2, 6, 6)
+__version__ = version = '2.6.7'
+__version_tuple__ = version_tuple = (2, 6, 7)

urwid/widget/grid_flow.py

@@ -116,7 +116,9 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         super()._invalidate()
 
     def _contents_modified(
-        self, slc, new_items: Iterable[tuple[Widget, tuple[Literal["given", WHSettings.GIVEN], int]]]
+        self,
+        _slc: tuple[int, int, int],
+        new_items: Iterable[tuple[Widget, tuple[Literal["given", WHSettings.GIVEN], int]]],
     ) -> None:
         for item in new_items:
             try:
@@ -291,7 +293,7 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
             return None
         return self.contents[self.focus_position][0]
 
-    def _get_focus(self) -> Widget:
+    def _get_focus(self) -> Widget | None:
         warnings.warn(
             f"method `{self.__class__.__name__}._get_focus` is deprecated, "
             f"please use `{self.__class__.__name__}.focus` property",
@@ -479,7 +481,7 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
 
             # Use width == maxcol in case of maxcol < width amount
             # Columns will use empty widget in case of GIVEN width > maxcol
-            c.contents.append((w, c.options(WHSettings.GIVEN, width_amount if width_amount <= maxcol else maxcol)))
+            c.contents.append((w, c.options(WHSettings.GIVEN, min(width_amount, maxcol))))
             if (i == self.focus_position) or (not column_focused and w.selectable()):
                 c.focus_position = len(c.contents) - 1
                 column_focused = True

{urwid-2.6.6.dist-info → urwid-2.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.6.6
+Version: 2.6.7
 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.6.dist-info → urwid-2.6.7.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=MQfDMt8obmx1lA3bZQCXZ_K2e1cj5mqx2lfvQITAvzA,411
+urwid/version.py,sha256=tZREgQXhRCjy8CaVlbDdgPh_RAE1RKJtFgHzY2HTyfw,411
 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
@@ -32,7 +32,7 @@ urwid/event_loop/__init__.py,sha256=6di4AYD6HbCf6v5p0rZOoteKnM9U5tfk4NKcWMH4FV4,
 urwid/event_loop/abstract_loop.py,sha256=6Kkw3KCJ4ndiI2I1P8fPdtHzjuekRxUuvzFOiR0Myok,5494
 urwid/event_loop/asyncio_loop.py,sha256=QoK1zO6YHg5dn2DPlCXSf9uXPHEe6k6P9pPJMWISB-Q,8473
 urwid/event_loop/glib_loop.py,sha256=GFoLAenoWKm-13rTBKzCF2JdCEryJKpMo25aidZ7BWs,9351
-urwid/event_loop/main_loop.py,sha256=ndrnkWbdrNrRS_L1Qht0J7FaYBJfwuZK26BFJ8I6L7I,26045
+urwid/event_loop/main_loop.py,sha256=gR2jGmqg1-CXFdNDlt-NizdS5AA7EZfmp6sW-nXwa18,26000
 urwid/event_loop/select_loop.py,sha256=5ZkIPqyIVJdWRTC89Ca5h8ub_-jpqXjFZaKqiWhdkDg,7534
 urwid/event_loop/tornado_loop.py,sha256=VNgXW2gO4edcYDjyEGb86yOHrE0NNXQUPXIOfJyZnAk,7100
 urwid/event_loop/trio_loop.py,sha256=2SBX1pbiJddAsXbe1itPPXYdoX5_U00m56A4h0x9dWI,10467
@@ -51,7 +51,7 @@ urwid/widget/divider.py,sha256=cM0gWHAqBz7E8l52CGEWWDMSVQkPNDjwy-t3ptbmh2s,3251
 urwid/widget/edit.py,sha256=qgVYeg_hX6tqRUiuLQkYwYKmWcfVLrLzAG1a5Au6S-w,23732
 urwid/widget/filler.py,sha256=EEnyAawdKXuwf79pErfNuvqsU1SVTutcMUrwWkU4wfo,14665
 urwid/widget/frame.py,sha256=AOe4FwjvwcIwrpXqyZkCwSZWwAALNl1XRMAKx6ZXYWs,21834
-urwid/widget/grid_flow.py,sha256=OSUaquJFWtvhXHzHb_BhEZLGQlGLDvZ1j3HE4VR8ldQ,21492
+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=s3hg3VoiDY3pfqEmkURIE_Fa8WcLLzuaJn-_LVfG0EM,69495
 urwid/widget/monitored_list.py,sha256=M0PjNc_Vtuk6fnWdDelx-nbs3jLtXAo4JKB_OTk8McI,18773
@@ -67,8 +67,8 @@ urwid/widget/treetools.py,sha256=7b2US3Dj_akQ2JCf5gPo1SKGfvIhnQjbkpcLfYl0Kk4,173
 urwid/widget/widget.py,sha256=dMGNVewj2NGFdGKAtDJYgOzhuJAtrr_BALOMwNzUyj0,29550
 urwid/widget/widget_decoration.py,sha256=aHP9Y7JKVCI2dw2OdRrzMj9p--C1pMIbxSJskWBLIgc,5633
 urwid/widget/wimp.py,sha256=4wfzTQBLMbhicSlL64hBPb-1W5FAFrIKfb43i10MKSY,27305
-urwid-2.6.6.dist-info/COPYING,sha256=NrbT-keRaUP9X-wxPFhHhJRgR-wTN6eLRA5ZkstZX4k,26434
-urwid-2.6.6.dist-info/METADATA,sha256=HG2vqY4oV76l6feC2qBZG4sbTSg_Pa4io8aS7lDKZc0,11042
-urwid-2.6.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-urwid-2.6.6.dist-info/top_level.txt,sha256=AwxQA43kNkjHbhYELXHBKrQ01X5CR2KnDzU07cVqilY,6
-urwid-2.6.6.dist-info/RECORD,,
+urwid-2.6.7.dist-info/COPYING,sha256=NrbT-keRaUP9X-wxPFhHhJRgR-wTN6eLRA5ZkstZX4k,26434
+urwid-2.6.7.dist-info/METADATA,sha256=Eb5tCnShmcVDexTEGqLILy1Du58ABPC31aGqbwmMRIc,11042
+urwid-2.6.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+urwid-2.6.7.dist-info/top_level.txt,sha256=AwxQA43kNkjHbhYELXHBKrQ01X5CR2KnDzU07cVqilY,6
+urwid-2.6.7.dist-info/RECORD,,