urwid 3.0.5__tar.gz → 4.0.0__tar.gz

{urwid-3.0.5 → urwid-4.0.0}/.github/workflows/documentation.yml

@@ -44,7 +44,7 @@ jobs:
         run: pip install -e .
       - name: Build documentation
         run: sphinx-build docs build/documentation
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7
         with:
           path: build/documentation
           name: documentation

{urwid-3.0.5 → urwid-4.0.0}/.github/workflows/pythonpackage.yml

@@ -172,13 +172,13 @@ jobs:
       - name: Build dist
         run: python -m build
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7
         with:
           path: dist/*.tar.gz
           name: built-sdist
           retention-days: 3
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7
         with:
           path: dist/*.whl
           name: built-bdist
@@ -199,7 +199,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade twine
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           # unpacks default artifact into dist/
           # if `name: wheels` is omitted, the action will create extra parent dir
@@ -224,7 +224,7 @@ jobs:
     permissions:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           pattern: built-*
           merge-multiple: true

{urwid-3.0.5 → urwid-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 3.0.5
+Version: 4.0.0
 Summary: A full-featured console (xterm et al.) user interface library
 Author-email: Ian Ward <ian@excess.org>
 License-Expression: LGPL-2.1-only

{urwid-3.0.5 → urwid-4.0.0}/pyproject.toml

@@ -30,14 +30,9 @@ platforms=["unix-like"]
 zip-safe = false
 
 [tool.setuptools.packages.find]
-exclude = [
-  "doc",
-  "docs",
-  "examples",
-  "test",
-  "tests",
-  "bin",
-  ".*"
+include = [
+  "urwid",
+  "urwid.*",
 ]
 namespaces = false
 

urwid-4.0.0/ruff-requirements.txt

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

{urwid-3.0.5 → urwid-4.0.0}/tests/test_event_loops.py

@@ -247,6 +247,7 @@ class AsyncioEventLoopTest(unittest.TestCase, EventLoopTestMixin):
         self.assertRaises(ZeroDivisionError, evl.run)
 
 
+@unittest.skip("Unstable test: race conditions happens")
 @unittest.skipUnless(GLIB_AVAILABLE, "GLIB unavailable")
 class GLibEventLoopTest(unittest.TestCase, EventLoopTestMixin):
     def setUp(self):

{urwid-3.0.5 → urwid-4.0.0}/urwid/__init__.py

@@ -255,15 +255,7 @@ VERSION = __version_tuple__
 __locals: dict[str, typing.Any] = locals()  # use mutable access for pure lazy loading
 
 # Backward compatible lazy load with deprecation warnings
-_moved_warn: dict[str, str] = {
-    "lcd_display": "urwid.display.lcd",
-    "html_fragment": "urwid.display.html_fragment",
-    "web_display": "urwid.display.web",
-    "monitored_list": "urwid.widget.monitored_list",
-    "listbox": "urwid.widget.listbox",
-    "treetools": "urwid.widget.treetools",
-}
-# Backward compatible lazy load without any warnings
+_moved_warn: dict[str, str] = {}
 # Before DeprecationWarning need to start PendingDeprecationWarning process.
 
 

{urwid-3.0.5 → urwid-4.0.0}/urwid/display/_posix_raw_display.py

@@ -315,7 +315,10 @@ class Screen(_raw_display_base.Screen):
             selector.register(fd, selectors.EVENT_READ)
             input_ready = selector.select(0)
             while input_ready:
-                chars.extend(os.read(fd, 1024))
+                chunk = os.read(fd, 1024)
+                if len(chunk) == 0:
+                    raise RuntimeError("stdin has been closed")
+                chars.extend(chunk)
                 input_ready = selector.select(0)
 
             return chars

{urwid-3.0.5 → urwid-4.0.0}/urwid/display/common.py

@@ -1018,7 +1018,8 @@ class BaseScreen(abc.ABC, metaclass=signals.MetaSignals):
         Deprecated in favor of calling `start` as a context manager.
         """
         warnings.warn(
-            "run_wrapper is deprecated in favor of calling `start` as a context manager.",
+            "run_wrapper is deprecated in favor of calling `start` as a context manager."
+            "API will be removed in version 5.0.",
             DeprecationWarning,
             stacklevel=3,
         )

{urwid-3.0.5 → urwid-4.0.0}/urwid/event_loop/main_loop.py

@@ -28,7 +28,6 @@ import os
 import sys
 import time
 import typing
-import warnings
 from contextlib import suppress
 
 from urwid import display, signals
@@ -169,16 +168,6 @@ class MainLoop:
         else:
             self._topmost_widget = self._widget
 
-    def _set_widget(self, widget: Widget) -> None:
-        warnings.warn(
-            f"method `{self.__class__.__name__}._set_widget` is deprecated, "
-            f"please use `{self.__class__.__name__}.widget` property."
-            "API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self.widget = widget
-
     @property
     def pop_ups(self) -> bool:
         return self._pop_ups
@@ -191,16 +180,6 @@ class MainLoop:
         else:
             self._topmost_widget = self._widget
 
-    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."
-            "API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self.pop_ups = pop_ups
-
     def set_alarm_in(self, sec: float, callback: Callable[[Self, _T], typing.Any], user_data: _T = None):
         """
         Schedule an alarm in *sec* seconds that will call *callback* from the

{urwid-3.0.5 → urwid-4.0.0}/urwid/font.py

@@ -33,8 +33,6 @@ from urwid.util import apply_target_encoding
 if typing.TYPE_CHECKING:
     from collections.abc import Iterator, Sequence
 
-    from typing_extensions import Literal
-
 
 def separate_glyphs(gdata: str, height: int) -> tuple[dict[str, tuple[int, list[str]]], bool]:
     """return (dictionary of glyphs, utf8 required)"""
@@ -100,7 +98,8 @@ def add_font(name: str, cls: FontRegistry) -> None:
     warnings.warn(
         "`add_font` is deprecated, please set 'name' attribute to the font class,"
         " use metaclass keyword argument 'font_name'"
-        " or use `Font.register(<name>)`",
+        " or use `Font.register(<name>)`"
+        "API will be removed in version 5.0.",
         DeprecationWarning,
         stacklevel=2,
     )
@@ -221,22 +220,6 @@ class Font(metaclass=FontRegistry):
         """Font description."""
         return f"{self.__class__.__name__}():\n  {self.height!r}\n  {pformat(self.data, indent=4)}"
 
-    @staticmethod
-    def _to_text(
-        obj: str,
-        encoding: str = "utf-8",
-        errors: Literal["strict", "ignore", "replace"] = "strict",
-    ) -> str:
-        warnings.warn(
-            "_to_text is deprecated: only text fonts are supported. API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        if isinstance(obj, str):
-            return obj
-
-        raise TypeError(f"{obj!r} is not str")
-
     def add_glyphs(self, gdata: str) -> None:
         d, utf8_required = separate_glyphs(gdata, self.height)
         self.char.update(d)

urwid-4.0.0/urwid/version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '4.0.0'
+__version_tuple__ = version_tuple = (4, 0, 0)
+
+__commit_id__ = commit_id = 'gc66b59ad5'

{urwid-3.0.5 → urwid-4.0.0}/urwid/widget/attr_wrap.py

@@ -71,22 +71,6 @@ class AttrWrap(AttrMap):
         )
         self.original_widget = new_widget
 
-    def get_w(self):
-        warnings.warn(
-            "backwards compatibility, widget used to be stored as original_widget. API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.original_widget
-
-    def set_w(self, new_widget: Widget) -> None:
-        warnings.warn(
-            "backwards compatibility, widget used to be stored as original_widget. API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self.original_widget = new_widget
-
     def get_attr(self) -> Hashable:
         return self.attr_map[None]
 

{urwid-3.0.5 → urwid-4.0.0}/urwid/widget/columns.py

@@ -483,26 +483,6 @@ class Columns(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
         box_columns = set(box_columns)
         self.contents = [(w, (t, n, i in box_columns)) for (i, (w, (t, n, b))) in enumerate(self.contents)]
 
-    @property
-    def has_flow_type(self) -> bool:
-        """
-        .. deprecated:: 1.0 Read values from :attr:`contents` instead.
-        """
-        warnings.warn(
-            ".has_flow_type is deprecated, read values from .contents instead. API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return WHSettings.PACK in self.column_types
-
-    @has_flow_type.setter
-    def has_flow_type(self, value):
-        warnings.warn(
-            ".has_flow_type is deprecated, read values from .contents instead. API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
     @property
     def contents(
         self,

{urwid-3.0.5 → urwid-4.0.0}/urwid/widget/filler.py

@@ -177,23 +177,6 @@ class Filler(WidgetDecoration[WrappedWidget]):
         )
         self.original_widget = new_body
 
-    def get_body(self) -> WrappedWidget:
-        """backwards compatibility, widget used to be stored as body"""
-        warnings.warn(
-            "backwards compatibility, widget used to be stored as body. API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.original_widget
-
-    def set_body(self, new_body: WrappedWidget) -> None:
-        warnings.warn(
-            "backwards compatibility, widget used to be stored as body. API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self.original_widget = new_body
-
     def selectable(self) -> bool:
         """Return selectable from body."""
         return self._original_widget.selectable()

{urwid-3.0.5 → urwid-4.0.0}/urwid/widget/listbox.py

@@ -896,7 +896,7 @@ class ListBox(Widget, WidgetContainerMixin):
 
             def __call__(inner_self) -> Self:
                 warnings.warn(
-                    "ListBox.contents is a property, not a method",
+                    "ListBox.contents is a property, not a method. Call API will be removed in version 5.0.",
                     DeprecationWarning,
                     stacklevel=3,
                 )

{urwid-3.0.5 → urwid-4.0.0}/urwid/widget/monitored_list.py

@@ -21,7 +21,6 @@ from __future__ import annotations
 
 import functools
 import typing
-import warnings
 
 if typing.TYPE_CHECKING:
     from collections.abc import Callable, Collection, Iterable, Iterator
@@ -244,26 +243,6 @@ class MonitoredFocusList(MonitoredList[_T], typing.Generic[_T]):
             self._focus_changed(index)
         self._focus = index
 
-    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."
-            "API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        return self.focus
-
-    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."
-            "API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        self.focus = index
-
     def _focus_changed(self, new_focus: int) -> None:  # pylint: disable=method-hidden  # monkeypatch used
         pass
 

{urwid-3.0.5 → urwid-4.0.0}/urwid/widget/pile.py

@@ -504,30 +504,6 @@ class Pile(Widget, WidgetContainerMixin, WidgetContainerListContentsMixin):
                 return
         raise ValueError(f"Widget not found in Pile contents: {item!r}")
 
-    @property
-    def focus_item(self):
-        warnings.warn(
-            "only for backwards compatibility."
-            "You should use the new standard container properties "
-            "`focus` and `focus_position` to get the child widget in focus or modify the focus position."
-            "API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.focus
-
-    @focus_item.setter
-    def focus_item(self, new_item):
-        warnings.warn(
-            "only for backwards compatibility."
-            "You should use the new standard container properties "
-            "`focus` and `focus_position` to get the child widget in focus or modify the focus position."
-            "API will be removed in version 4.0.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self.focus = new_item
-
     @property
     def focus_position(self) -> int:
         """

{urwid-3.0.5 → urwid-4.0.0}/urwid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urwid
-Version: 3.0.5
+Version: 4.0.0
 Summary: A full-featured console (xterm et al.) user interface library
 Author-email: Ian Ward <ian@excess.org>
 License-Expression: LGPL-2.1-only

{urwid-3.0.5 → urwid-4.0.0}/urwid.egg-info/SOURCES.txt

@@ -221,7 +221,6 @@ tests/test_grid_flow.py
 tests/test_line_box.py
 tests/test_listbox.py
 tests/test_main_loop.py
-tests/test_moved_imports.py
 tests/test_overlay.py
 tests/test_padding.py
 tests/test_pile.py
@@ -238,8 +237,6 @@ tests/util.py
 urwid/__init__.py
 urwid/canvas.py
 urwid/command_map.py
-urwid/container.py
-urwid/decoration.py
 urwid/font.py
 urwid/graphics.py
 urwid/numedit.py
@@ -250,7 +247,6 @@ urwid/text_layout.py
 urwid/util.py
 urwid/version.py
 urwid/vterm.py
-urwid/wimp.py
 urwid.egg-info/PKG-INFO
 urwid.egg-info/SOURCES.txt
 urwid.egg-info/dependency_links.txt

urwid-3.0.5/ruff-requirements.txt

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

urwid-3.0.5/tests/test_moved_imports.py

@@ -1,19 +0,0 @@
-from __future__ import annotations
-
-import unittest
-
-
-class TestMovedImports(unittest.TestCase):
-    def test_moved_imports_direct(self) -> None:
-        with self.assertWarns(DeprecationWarning):
-            from urwid import web_display
-
-        from urwid.display import web
-
-        self.assertIs(web, web_display)
-
-    def test_moved_imports_nested(self) -> None:
-        from urwid.display import html_fragment
-        from urwid.html_fragment import HtmlGenerator
-
-        self.assertIs(html_fragment.HtmlGenerator, HtmlGenerator)

urwid-3.0.5/urwid/container.py

@@ -1,59 +0,0 @@
-# Urwid container widget classes
-#    Copyright (C) 2004-2012  Ian Ward
-#
-#    This library is free software; you can redistribute it and/or
-#    modify it under the terms of the GNU Lesser General Public
-#    License as published by the Free Software Foundation; either
-#    version 2.1 of the License, or (at your option) any later version.
-#
-#    This library is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#    Lesser General Public License for more details.
-#
-#    You should have received a copy of the GNU Lesser General Public
-#    License along with this library; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# Urwid web site: https://urwid.org/
-
-
-from __future__ import annotations
-
-import warnings
-
-from urwid.widget import (
-    Columns,
-    ColumnsError,
-    Frame,
-    FrameError,
-    GridFlow,
-    GridFlowError,
-    Overlay,
-    OverlayError,
-    Pile,
-    PileError,
-    WidgetContainerMixin,
-)
-
-__all__ = (
-    "Columns",
-    "ColumnsError",
-    "Frame",
-    "FrameError",
-    "GridFlow",
-    "GridFlowError",
-    "Overlay",
-    "OverlayError",
-    "Pile",
-    "PileError",
-    "WidgetContainerMixin",
-)
-
-warnings.warn(
-    f"{__name__!r} is not expected to be imported directly. "
-    'Please use public access from "urwid" package. '
-    f"Module {__name__!r} is deprecated and will be removed in the version 4.0.",
-    DeprecationWarning,
-    stacklevel=3,
-)

urwid-3.0.5/urwid/decoration.py

@@ -1,65 +0,0 @@
-# Urwid widget decoration classes
-#    Copyright (C) 2004-2012  Ian Ward
-#
-#    This library is free software; you can redistribute it and/or
-#    modify it under the terms of the GNU Lesser General Public
-#    License as published by the Free Software Foundation; either
-#    version 2.1 of the License, or (at your option) any later version.
-#
-#    This library is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#    Lesser General Public License for more details.
-#
-#    You should have received a copy of the GNU Lesser General Public
-#    License along with this library; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# Urwid web site: https://urwid.org/
-
-
-from __future__ import annotations
-
-import warnings
-
-from urwid.widget import (
-    AttrMap,
-    AttrMapError,
-    AttrWrap,
-    BoxAdapter,
-    BoxAdapterError,
-    Filler,
-    FillerError,
-    Padding,
-    PaddingError,
-    WidgetDecoration,
-    WidgetDisable,
-    WidgetPlaceholder,
-    calculate_top_bottom_filler,
-    normalize_valign,
-)
-
-__all__ = (
-    "AttrMap",
-    "AttrMapError",
-    "AttrWrap",
-    "BoxAdapter",
-    "BoxAdapterError",
-    "Filler",
-    "FillerError",
-    "Padding",
-    "PaddingError",
-    "WidgetDecoration",
-    "WidgetDisable",
-    "WidgetPlaceholder",
-    "calculate_top_bottom_filler",
-    "normalize_valign",
-)
-
-warnings.warn(
-    f"{__name__!r} is not expected to be imported directly. "
-    'Please use public access from "urwid" package. '
-    f"Module {__name__!r} is deprecated and will be removed in the version 4.0.",
-    DeprecationWarning,
-    stacklevel=3,
-)

urwid-3.0.5/urwid/version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    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.5'
-__version_tuple__ = version_tuple = (3, 0, 5)
-
-__commit_id__ = commit_id = 'gdc1616c59'

urwid-3.0.5/urwid/wimp.py

@@ -1,23 +0,0 @@
-from __future__ import annotations
-
-import warnings
-
-from urwid.widget import Button, CheckBox, CheckBoxError, PopUpLauncher, PopUpTarget, RadioButton, SelectableIcon
-
-__all__ = (
-    "Button",
-    "CheckBox",
-    "CheckBoxError",
-    "PopUpLauncher",
-    "PopUpTarget",
-    "RadioButton",
-    "SelectableIcon",
-)
-
-warnings.warn(
-    f"{__name__!r} is not expected to be imported directly. "
-    'Please use public access from "urwid" package. '
-    f"Module {__name__!r} is deprecated and will be removed in the version 4.0.",
-    DeprecationWarning,
-    stacklevel=3,
-)