urwid 2.6.16__py3-none-any.whl → 3.0.1__py3-none-any.whl

urwid/widget/grid_flow.py

@@ -144,8 +144,9 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         """
         warnings.warn(
             "only for backwards compatibility."
-            "You should use the new standard container property `contents` to modify GridFlow",
-            PendingDeprecationWarning,
+            "You should use the new standard container property `contents` to modify GridFlow."
+            "API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         ml = MonitoredList(w for w, t in self.contents)
@@ -160,8 +161,9 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
     def cells(self, widgets: Sequence[Widget]):
         warnings.warn(
             "only for backwards compatibility."
-            "You should use the new standard container property `contents` to modify GridFlow",
-            PendingDeprecationWarning,
+            "You should use the new standard container property `contents` to modify GridFlow."
+            "API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         focus_position = self.focus_position
@@ -169,24 +171,6 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         if focus_position < len(widgets):
             self.focus_position = focus_position
 
-    def _get_cells(self):
-        warnings.warn(
-            "only for backwards compatibility."
-            "You should use the new standard container property `contents` to modify GridFlow",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        return self.cells
-
-    def _set_cells(self, widgets: Sequence[Widget]):
-        warnings.warn(
-            "only for backwards compatibility."
-            "You should use the new standard container property `contents` to modify GridFlow",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        self.cells = widgets
-
     @property
     def cell_width(self) -> int:
         """
@@ -202,24 +186,6 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         self.focus_position = focus_position
         self._cell_width = width
 
-    def _get_cell_width(self) -> int:
-        warnings.warn(
-            f"Method `{self.__class__.__name__}._get_cell_width` is deprecated, "
-            f"please use property `{self.__class__.__name__}.cell_width`",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        return self.cell_width
-
-    def _set_cell_width(self, width: int) -> None:
-        warnings.warn(
-            f"Method `{self.__class__.__name__}._set_cell_width` is deprecated, "
-            f"please use property `{self.__class__.__name__}.cell_width`",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        self.cell_width = width
-
     @property
     def contents(self) -> MonitoredFocusList[tuple[Widget, tuple[Literal[WHSettings.GIVEN], int]]]:
         """
@@ -270,8 +236,9 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         """
         warnings.warn(
             "only for backwards compatibility."
-            "You may also use the new standard container property `focus_position` to set the focus.",
-            PendingDeprecationWarning,
+            "You may also use the new standard container property `focus_position` to set the focus."
+            "API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         if isinstance(cell, int):
@@ -298,17 +265,6 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
             return None
         return self.contents[self.focus_position][0]
 
-    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",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        if not self.contents:
-            return None
-        return self.contents[self.focus_position][0]
-
     def get_focus(self):
         """
         Return the widget in focus, for backwards compatibility.
@@ -318,8 +274,9 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         """
         warnings.warn(
             "only for backwards compatibility."
-            "You may also use the new standard container property `focus` to get the focus.",
-            PendingDeprecationWarning,
+            "You may also use the new standard container property `focus` to get the focus."
+            "API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         if not self.contents:
@@ -331,8 +288,9 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         warnings.warn(
             "only for backwards compatibility."
             "You may also use the new standard container property"
-            "`focus` to get the focus and `focus_position` to get/set the cell in focus by index",
-            PendingDeprecationWarning,
+            "`focus` to get the focus and `focus_position` to get/set the cell in focus by index."
+            "API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         return self.focus
@@ -342,23 +300,10 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         warnings.warn(
             "only for backwards compatibility."
             "You may also use the new standard container property"
-            "`focus` to get the focus and `focus_position` to get/set the cell in focus by index",
-            PendingDeprecationWarning,
-            stacklevel=2,
-        )
-        for i, (w, _options) in enumerate(self.contents):
-            if cell == w:
-                self.focus_position = i
-                return
-        raise ValueError(f"Widget not found in GridFlow contents: {cell!r}")
-
-    def _set_focus_cell(self, cell: Widget) -> None:
-        warnings.warn(
-            "only for backwards compatibility."
-            "You may also use the new standard container property"
-            "`focus` to get the focus and `focus_position` to get/set the cell in focus by index",
+            "`focus` to get the focus and `focus_position` to get/set the cell in focus by index."
+            "API will be removed in version 5.0.",
             DeprecationWarning,
-            stacklevel=3,
+            stacklevel=2,
         )
         for i, (w, _options) in enumerate(self.contents):
             if cell == w:
@@ -392,38 +337,6 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
             ) from exc
         self.contents.focus = position
 
-    def _get_focus_position(self) -> int | None:
-        warnings.warn(
-            f"method `{self.__class__.__name__}._get_focus_position` is deprecated, "
-            f"please use `{self.__class__.__name__}.focus_position` property",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        if not self.contents:
-            raise IndexError("No focus_position, GridFlow is empty")
-        return self.contents.focus
-
-    def _set_focus_position(self, position: int) -> None:
-        """
-        Set the widget in focus.
-
-        position -- index of child widget to be made focus
-        """
-        warnings.warn(
-            f"method `{self.__class__.__name__}._set_focus_position` is deprecated, "
-            f"please use `{self.__class__.__name__}.focus_position` property",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        try:
-            if position < 0 or position >= len(self.contents):
-                raise IndexError(f"No GridFlow child widget at position {position}")
-        except TypeError as exc:
-            raise IndexError(f"No GridFlow child widget at position {position}").with_traceback(
-                exc.__traceback__
-            ) from exc
-        self.contents.focus = position
-
     def _get_maxcol(self, size: tuple[int] | tuple[()]) -> int:
         if size:
             (maxcol,) = size
@@ -540,10 +453,12 @@ class GridFlow(WidgetWrap[Pile], WidgetContainerMixin, WidgetContainerListConten
         Captures focus changes.
         """
         self.get_display_widget(size)
-        key = super().keypress(size, key)
-        if key is None:
-            self._set_focus_from_display_widget()
-        return key
+
+        if (key := super().keypress(size, key)) is not None:
+            return key
+
+        self._set_focus_from_display_widget()
+        return None
 
     def pack(
         self,

urwid/widget/line_box.py

@@ -167,6 +167,19 @@ class LineBox(WidgetDecoration[WrappedWidget], delegate_to_widget_mixin("_wrappe
 
         super().__init__(original_widget)
 
+    @property
+    def original_widget(self) -> WrappedWidget:
+        return super().original_widget
+
+    @original_widget.setter
+    def original_widget(self, original_widget: WrappedWidget) -> None:
+        v_index = int(bool(self.tline_widget))  # we care only about top
+        h_index = 1  # constant
+        middle: Columns = typing.cast("Columns", self._wrapped_widget[v_index])
+        _old_widget, options = middle.contents[h_index]
+        middle.contents[h_index] = (original_widget, options)
+        WidgetDecoration.original_widget.fset(self, original_widget)
+
     @property
     def _w(self) -> Pile:
         return self._wrapped_widget

urwid/widget/listbox.py

@@ -26,8 +26,6 @@ import warnings
 from collections.abc import Iterable, Sized
 from contextlib import suppress
 
-from typing_extensions import Protocol, runtime_checkable
-
 from urwid import signals
 from urwid.canvas import CanvasCombine, SolidCanvas
 
@@ -65,8 +63,8 @@ class ListWalkerError(Exception):
     pass
 
 
-@runtime_checkable
-class ScrollSupportingBody(Protocol):
+@typing.runtime_checkable
+class ScrollSupportingBody(typing.Protocol):
     """Protocol for ListWalkers."""
 
     def get_focus(self) -> tuple[Widget, _K]: ...
@@ -78,8 +76,8 @@ class ScrollSupportingBody(Protocol):
     def get_prev(self, position: _K) -> tuple[Widget, _K] | tuple[None, None]: ...
 
 
-@runtime_checkable
-class EstimatedSized(Protocol):
+@typing.runtime_checkable
+class EstimatedSized(typing.Protocol):
     """Widget can estimate it's size.
 
     PEP 424 defines API for memory-efficiency.
@@ -166,15 +164,6 @@ class SimpleListWalker(MonitoredList[_T], ListWalker):
         """
         return self
 
-    def _get_contents(self) -> Self:
-        warnings.warn(
-            f"Method `{self.__class__.__name__}._get_contents` is deprecated, "
-            f"please use property`{self.__class__.__name__}.contents`",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        return self
-
     def _modified(self) -> None:
         if self.focus >= len(self):
             self.focus = max(0, len(self) - 1)
@@ -426,24 +415,6 @@ class ListBox(Widget, WidgetContainerMixin):
             self.render = nocache_widget_render_instance(self)
         self._invalidate()
 
-    def _get_body(self):
-        warnings.warn(
-            f"Method `{self.__class__.__name__}._get_body` is deprecated, "
-            f"please use property `{self.__class__.__name__}.body`",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        return self.body
-
-    def _set_body(self, body):
-        warnings.warn(
-            f"Method `{self.__class__.__name__}._set_body` is deprecated, "
-            f"please use property `{self.__class__.__name__}.body`",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        self.body = body
-
     @property
     def __len__(self) -> Callable[[], int]:
         if isinstance(self._body, Sized):
@@ -873,8 +844,9 @@ class ListBox(Widget, WidgetContainerMixin):
         warnings.warn(
             "only for backwards compatibility."
             "You may also use the new standard container property `focus` to get the focus "
-            "and property `focus_position` to read these values.",
-            PendingDeprecationWarning,
+            "and property `focus_position` to read these values."
+            "API will be removed in version 5.0.",
+            DeprecationWarning,
             stacklevel=2,
         )
         return self._body.get_focus()
@@ -888,15 +860,6 @@ class ListBox(Widget, WidgetContainerMixin):
         """
         return self._body.get_focus()[0]
 
-    def _get_focus(self) -> Widget:
-        warnings.warn(
-            f"method `{self.__class__.__name__}._get_focus` is deprecated, "
-            f"please use `{self.__class__.__name__}.focus` property",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        return self.focus
-
     def _get_focus_position(self):
         """
         Return the list walker position of the widget in focus. The type
@@ -1938,8 +1901,7 @@ class ListBox(Widget, WidgetContainerMixin):
             )
             return False
 
-        handled = w.mouse_event((maxcol,), event, button, col, row - wrow, focus)
-        if handled:
+        if w.mouse_event((maxcol,), event, button, col, row - wrow, focus):
             return True
 
         if is_mouse_press(event):
@@ -1995,8 +1957,8 @@ class ListBox(Widget, WidgetContainerMixin):
         the focus up to the top.  This is the best we can do with
         a minimal list walker implementation.
         """
-        positions_fn = getattr(self._body, "positions", None)
-        if positions_fn:
+
+        if positions_fn := getattr(self._body, "positions", None):
             yield from positions_fn()
             return
 
@@ -2026,8 +1988,8 @@ class ListBox(Widget, WidgetContainerMixin):
         reverse of what `__iter__()` produces, but this is the best we can
         do with a minimal list walker implementation.
         """
-        positions_fn = getattr(self._body, "positions", None)
-        if positions_fn:
+
+        if positions_fn := getattr(self._body, "positions", None):
             yield from positions_fn(reverse=True)
             return
 

urwid/widget/monitored_list.py

@@ -37,7 +37,7 @@ _T = typing.TypeVar("_T")
 
 
 def _call_modified(
-    fn: Callable[Concatenate[MonitoredList, ArgSpec], Ret]
+    fn: Callable[Concatenate[MonitoredList, ArgSpec], Ret],
 ) -> Callable[Concatenate[MonitoredList, ArgSpec], Ret]:
     @functools.wraps(fn)
     def call_modified_wrapper(self: MonitoredList, *args: ArgSpec.args, **kwargs: ArgSpec.kwargs) -> Ret:
@@ -48,7 +48,7 @@ def _call_modified(
     return call_modified_wrapper
 
 
-class MonitoredList(typing.List[_T], typing.Generic[_T]):
+class MonitoredList(list[_T], typing.Generic[_T]):
     """
     This class can trigger a callback any time its contents are changed
     with the usual list operations append, extend, etc.
@@ -245,7 +245,8 @@ class MonitoredFocusList(MonitoredList[_T], typing.Generic[_T]):
     def _get_focus(self) -> int | None:
         warnings.warn(
             f"method `{self.__class__.__name__}._get_focus` is deprecated, "
-            f"please use `{self.__class__.__name__}.focus` property",
+            f"please use `{self.__class__.__name__}.focus` property."
+            "API will be removed in version 4.0.",
             DeprecationWarning,
             stacklevel=3,
         )
@@ -254,7 +255,8 @@ class MonitoredFocusList(MonitoredList[_T], typing.Generic[_T]):
     def _set_focus(self, index: int) -> None:
         warnings.warn(
             f"method `{self.__class__.__name__}._set_focus` is deprecated, "
-            f"please use `{self.__class__.__name__}.focus` property",
+            f"please use `{self.__class__.__name__}.focus` property."
+            "API will be removed in version 4.0.",
             DeprecationWarning,
             stacklevel=3,
         )

urwid/widget/overlay.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import typing
 import warnings
+from collections.abc import MutableSequence
 
 from urwid.canvas import CanvasOverlay, CompositeCanvas
 from urwid.split_repr import remove_defaults
@@ -28,7 +29,7 @@ from .padding import calculate_left_right_padding
 from .widget import Widget, WidgetError, WidgetWarning
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Iterator, MutableSequence, Sequence
+    from collections.abc import Iterator, Sequence
 
     from typing_extensions import Literal
 
@@ -582,15 +583,6 @@ class Overlay(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin, ty
         """
         return self.top_w
 
-    def _get_focus(self) -> TopWidget:
-        warnings.warn(
-            f"method `{self.__class__.__name__}._get_focus` is deprecated, "
-            f"please use `{self.__class__.__name__}.focus` property",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        return self.top_w
-
     @property
     def focus_position(self) -> Literal[1]:
         """
@@ -608,30 +600,6 @@ class Overlay(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin, ty
         if position != 1:
             raise IndexError(f"Overlay widget focus_position currently must always be set to 1, not {position}")
 
-    def _get_focus_position(self) -> int | None:
-        warnings.warn(
-            f"method `{self.__class__.__name__}._get_focus_position` is deprecated, "
-            f"please use `{self.__class__.__name__}.focus_position` property",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        return 1
-
-    def _set_focus_position(self, position: int) -> None:
-        """
-        Set the widget in focus.
-
-        position -- index of child widget to be made focus
-        """
-        warnings.warn(
-            f"method `{self.__class__.__name__}._set_focus_position` is deprecated, "
-            f"please use `{self.__class__.__name__}.focus_position` property",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        if position != 1:
-            raise IndexError(f"Overlay widget focus_position currently must always be set to 1, not {position}")
-
     @property
     def contents(self) -> MutableSequence[tuple[TopWidget | BottomWidget, OverlayOptions]]:
         """
@@ -658,14 +626,13 @@ class Overlay(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin, ty
 
         # noinspection PyMethodParameters
         class OverlayContents(
-            typing.MutableSequence[
-                typing.Tuple[
+            MutableSequence[
+                tuple[
                     typing.Union[TopWidget, BottomWidget],
                     OverlayOptions,
                 ]
             ]
         ):
-
             # pylint: disable=no-self-argument
             def __len__(inner_self) -> int:
                 return 2

urwid/widget/padding.py

@@ -215,24 +215,6 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
         self._align_type, self._align_amount = normalize_align(align, PaddingError)
         self._invalidate()
 
-    def _get_align(self) -> Literal["left", "center", "right"] | tuple[Literal["relative"], int]:
-        warnings.warn(
-            f"Method `{self.__class__.__name__}._get_align` is deprecated, "
-            f"please use property `{self.__class__.__name__}.align`",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.align
-
-    def _set_align(self, align: Literal["left", "center", "right"] | tuple[Literal["relative"], int]) -> None:
-        warnings.warn(
-            f"Method `{self.__class__.__name__}._set_align` is deprecated, "
-            f"please use property `{self.__class__.__name__}.align`",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self.align = align
-
     @property
     def width(
         self,
@@ -261,24 +243,6 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
         self._width_type, self._width_amount = normalize_width(width, PaddingError)
         self._invalidate()
 
-    def _get_width(self) -> Literal["clip", "pack"] | int | tuple[Literal["relative"], int]:
-        warnings.warn(
-            f"Method `{self.__class__.__name__}._get_width` is deprecated, "
-            f"please use property `{self.__class__.__name__}.width`",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.width
-
-    def _set_width(self, width: Literal["clip", "pack"] | int | tuple[Literal["relative"], int]) -> None:
-        warnings.warn(
-            f"Method `{self.__class__.__name__}._set_width` is deprecated, "
-            f"please use property `{self.__class__.__name__}.width`",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self.width = width
-
     def pack(
         self,
         size: tuple[()] | tuple[int] | tuple[int, int] = (),
@@ -339,9 +303,9 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
                     PaddingWarning,
                     stacklevel=3,
                 )
-            canv = self._original_widget.render((maxcol,) + size[1:], focus)
+            canv = self._original_widget.render((maxcol, *size[1:]), focus)
         elif self._width_type == WHSettings.GIVEN:
-            canv = self._original_widget.render((self._width_amount,) + size[1:], focus)
+            canv = self._original_widget.render((self._width_amount, *size[1:]), focus)
         else:
             canv = self._original_widget.render((), focus)
 
@@ -439,7 +403,7 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
         """Pass keypress to self._original_widget."""
         left, right = self.padding_values(size, True)
         if size:
-            maxvals = (size[0] - left - right,) + size[1:]
+            maxvals = (size[0] - left - right, *size[1:])
             return self._original_widget.keypress(maxvals, key)
         return self._original_widget.keypress((), key)
 
@@ -450,18 +414,17 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
 
         left, right = self.padding_values(size, True)
         if size:
-            maxvals = (size[0] - left - right,) + size[1:]
+            maxvals = (size[0] - left - right, *size[1:])
             if maxvals[0] == 0:
                 return None
         else:
             maxvals = ()
 
-        coords = self._original_widget.get_cursor_coords(maxvals)
-        if coords is None:
-            return None
+        if (coords := self._original_widget.get_cursor_coords(maxvals)) is not None:
+            x, y = coords
+            return x + left, y
 
-        x, y = coords
-        return x + left, y
+        return None
 
     def move_cursor_to_coords(
         self,
@@ -479,7 +442,7 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
         left, right = self.padding_values(size, True)
         if size:
             maxcol = size[0]
-            maxvals = (maxcol - left - right,) + size[1:]
+            maxvals = (maxcol - left - right, *size[1:])
         else:
             maxcol = self.pack((), True)[0]
             maxvals = ()
@@ -511,7 +474,7 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
             maxcol = size[0]
             if col < left or col >= maxcol - right:
                 return False
-            maxvals = (maxcol - left - right,) + size[1:]
+            maxvals = (maxcol - left - right, *size[1:])
         else:
             maxvals = ()
 
@@ -524,7 +487,7 @@ class Padding(WidgetDecoration[WrappedWidget], typing.Generic[WrappedWidget]):
 
         left, right = self.padding_values(size, True)
         if size:
-            maxvals = (size[0] - left - right,) + size[1:]
+            maxvals = (size[0] - left - right, *size[1:])
         else:
             maxvals = ()