urwid 2.5.3__tar.gz → 2.6.0.post0__tar.gz

{urwid-2.5.3 → urwid-2.6.0.post0}/.github/workflows/isolated_static_check.yml

@@ -28,7 +28,7 @@ jobs:
           pip install --upgrade -r isort-requirements.txt
       - name: Check imports with isort
         run: |
-          isort --check --diff urwid tests examples
+          isort --check --diff .
 
   Black:
     name: Validate black formatting
@@ -46,7 +46,7 @@ jobs:
           pip install --upgrade -r black-requirements.txt
       - name: Check code style with black
         run: |
-          black --check urwid examples
+          black --check .
 
   Ruff:
     name: Check with Ruff
@@ -64,7 +64,7 @@ jobs:
           pip install --upgrade -r ruff-requirements.txt
       - name: Lint with ruff
         run: |
-          ruff check --output-format github urwid examples
+          ruff check --output-format github .
 
   PyLint:
     name: Check with pylint

{urwid-2.5.3 → urwid-2.6.0.post0}/.github/workflows/pythonpackage.yml

@@ -43,7 +43,7 @@ jobs:
           pip install --upgrade -r isort-requirements.txt
       - name: Check imports with isort
         run: |
-          isort --check --diff urwid tests examples
+          isort --check --diff .
 
   Black:
     name: Validate black formatting
@@ -61,7 +61,7 @@ jobs:
           pip install --upgrade -r black-requirements.txt
       - name: Check code style with black
         run: |
-          black --check urwid examples
+          black --check .
 
   Ruff:
     name: Check with Ruff
@@ -79,7 +79,7 @@ jobs:
           pip install --upgrade -r ruff-requirements.txt
       - name: Lint with ruff
         run: |
-          ruff check --output-format github urwid examples
+          ruff check --output-format github .
 
   PyLint:
     name: Check with pylint
@@ -167,53 +167,8 @@ jobs:
         with:
           parallel-finished: true
 
-  build_wheels:
-    name: Build wheels on ${{ matrix.os }}
-    needs: [ Test, Isort, Black, Ruff, PyLint ]
-    # build only on push: heavy job
-    if: github.event_name == 'push' && github.repository == 'urwid/urwid'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # need for setuptools_scm
-
-      # Used to host cibuildwheel
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Set up QEMU
-        if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
-
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
-        env:
-          # configure cibuildwheel to build native archs ('auto'), and some
-          # emulated ones
-          CIBW_ARCHS_LINUX: auto aarch64
-          CIBW_ARCHS_MACOS: x86_64 universal2 arm64
-          CIBW_ARCHS_WINDOWS: auto
-
-      - uses: actions/upload-artifact@v4
-        with:
-          path: ./wheelhouse/*.whl
-          name: built-${{ matrix.os }}
-          retention-days: 3
-
-  build_sdist:
-    name: Build source distribution
+  build:
+    name: Build distribution
     needs: [ Test, Isort, Black, Ruff, PyLint ]
     runs-on: ubuntu-latest
     steps:
@@ -228,8 +183,8 @@ jobs:
       - name: Install dependencies
         run: pip install -U build
 
-      - name: Build sdist
-        run: python -m build -s
+      - name: Build dist
+        run: python -m build
 
       - uses: actions/upload-artifact@v4
         with:
@@ -237,10 +192,16 @@ jobs:
           name: built-sdist
           retention-days: 3
 
+      - uses: actions/upload-artifact@v4
+        with:
+          path: dist/*.whl
+          name: built-bdist
+          retention-days: 3
+
   Metadata:
     name: Validate metadata
     runs-on: ubuntu-latest
-    needs: [ build_sdist ]
+    needs: [ build ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -265,7 +226,7 @@ jobs:
           twine check dist/*
 
   upload_pypi:
-    needs: [ build_wheels, build_sdist, Metadata ]
+    needs: [ build, Metadata ]
     # upload to PyPI on every tag
     if: github.event_name == 'push' && github.ref_type == 'tag' && github.repository == 'urwid/urwid'
     # alternatively, to publish when a GitHub Release is created, use the following rule:
@@ -284,4 +245,4 @@ jobs:
           path: dist
 
       - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@release/v1

urwid-2.6.0.post0/.pre-commit-config.yaml

@@ -0,0 +1,45 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: mixed-line-ending
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.13.2
+    hooks:
+      - id: isort
+        name: isort (python)
+      - id: isort
+        name: isort (cython)
+        types: [cython]
+      - id: isort
+        name: isort (pyi)
+        types: [pyi]
+
+  - repo: https://github.com/psf/black
+    rev: 24.2.0
+    hooks:
+      - id: black
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.2.1
+    hooks:
+      - id: ruff
+        args: [ --fix, --exit-non-zero-on-fix ]
+
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.35.0
+    hooks:
+      - id: yamllint
+
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.10.0  # Use the ref you want to point at
+    hooks:
+      - id: python-check-blanket-noqa
+      - id: python-check-blanket-type-ignore
+      - id: rst-directive-colons
+      - id: rst-inline-touching-normal

{urwid-2.5.3/urwid.egg-info → urwid-2.6.0.post0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urwid
-Version: 2.5.3
+Version: 2.6.0.post0
 Summary: A full-featured console (xterm et al.) user interface library
 Home-page: https://urwid.org/
 Author-email: Ian Ward <ian@excess.org>
@@ -32,7 +32,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.7.0
+Requires-Python: >3.7
 Description-Content-Type: text/x-rst
 License-File: COPYING
 Requires-Dist: typing-extensions
@@ -57,7 +57,7 @@ Requires-Dist: pyserial; extra == "lcd"
 
 Urwid
 =====
-|pypi| |docs| |gitter| |ci| |coveralls|
+|pypi| |docs| |gitter| |ci| |pre-commit| |coveralls|
 
 About
 =====
@@ -87,7 +87,7 @@ Installation
 To install using pip
 
 .. code:: bash
-   
+
    pip install urwid
 
 For advanced functionality extra requirements need to be installed.
@@ -323,6 +323,10 @@ Contributors
     :target: https://github.com/urwid/urwid/actions
     :alt: CI status
 
+.. |pre-commit| image:: https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit
+   :target: https://github.com/pre-commit/pre-commit
+   :alt: pre-commit
+
 .. |coveralls| image:: https://coveralls.io/repos/github/urwid/urwid/badge.svg
     :alt: test coverage
     :target: https://coveralls.io/github/urwid/urwid

{urwid-2.5.3 → urwid-2.6.0.post0}/README.rst

@@ -1,6 +1,6 @@
 Urwid
 =====
-|pypi| |docs| |gitter| |ci| |coveralls|
+|pypi| |docs| |gitter| |ci| |pre-commit| |coveralls|
 
 About
 =====
@@ -30,7 +30,7 @@ Installation
 To install using pip
 
 .. code:: bash
-   
+
    pip install urwid
 
 For advanced functionality extra requirements need to be installed.
@@ -266,6 +266,10 @@ Contributors
     :target: https://github.com/urwid/urwid/actions
     :alt: CI status
 
+.. |pre-commit| image:: https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit
+   :target: https://github.com/pre-commit/pre-commit
+   :alt: pre-commit
+
 .. |coveralls| image:: https://coveralls.io/repos/github/urwid/urwid/badge.svg
     :alt: test coverage
     :target: https://coveralls.io/github/urwid/urwid

{urwid-2.5.3 → urwid-2.6.0.post0}/docs/conf.py

@@ -12,6 +12,7 @@
 
 from __future__ import annotations
 
+import ast
 import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -51,7 +52,7 @@ master_doc = "index"
 
 # General information about the project.
 project = "Urwid"
-copyright = "2014, Ian Ward et al"
+copyright = "2014, Ian Ward et al"  # noqa: A001  # sphinx magic
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -61,13 +62,29 @@ VERSION_MODULE = os.path.abspath(os.path.join(FILE_PATH, "../urwid/version.py"))
 VERSION_VARS = {}
 
 
-def execfile(module, global_vars):
-    with open(module) as f:
-        code = compile(f.read(), "somefile.py", "exec")
-        exec(code, global_vars)
+with open(VERSION_MODULE, encoding="utf-8") as f:
+    parsed = ast.parse(f.read())
+    for node in parsed.body:
+        if not isinstance(node, (ast.Assign, ast.AnnAssign)):
+            # Not variable define
+            continue
 
+        if node.value is None:
+            # Not a proper assign
+            continue
+
+        try:
+            value = ast.literal_eval(node.value)
+        except ValueError:
+            continue
+
+        if isinstance(node, ast.Assign):
+            VERSION_VARS.update(
+                {tgt.id: value for tgt in node.targets if isinstance(tgt, ast.Name) and isinstance(tgt.ctx, ast.Store)}
+            )
+        else:
+            VERSION_VARS[node.target.id] = value
 
-execfile(VERSION_MODULE, VERSION_VARS)
 # The short X.Y version.
 version = ".".join(str(x) for x in VERSION_VARS["__version_tuple__"][:2])
 # The full version, including alpha/beta/rc tags.

{urwid-2.5.3 → urwid-2.6.0.post0}/docs/examples/browse.py

@@ -6,5 +6,5 @@ import os
 
 import real_browse
 
-os.chdir('/usr/share/doc/python')
+os.chdir("/usr/share/doc/python")
 real_browse.main()

{urwid-2.5.3 → urwid-2.6.0.post0}/docs/examples/subproc2.py

@@ -4,9 +4,11 @@ import time
 
 time.sleep(1)
 
-print("""factor: 1
+print(
+    """factor: 1
 factor: 1000003
 factor: 2000029
 factor: 3000073
 factor: 4000159
-factor: 5000101""")
+factor: 5000101"""
+)

urwid-2.6.0.post0/docs/manual/bright_combinations.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+
+from __future__ import annotations
+
+import sys
+
+import urwid
+
+RED_FGS = (
+    "black",
+    "light gray",
+    "white",
+    "light cyan",
+    "light red",
+    "light green",
+    "yellow",
+    "light magenta",
+)
+GREEN_FGS = (
+    "black",
+    "light gray",
+    "dark blue",
+    "white",
+    "light cyan",
+    "light red",
+    "light green",
+    "yellow",
+)
+BROWN_FGS = (
+    "black",
+    "dark blue",
+    "dark gray",
+    "white",
+    "light blue",
+    "light cyan",
+    "light red",
+    "light green",
+    "yellow",
+)
+MAGENTA_FGS = (
+    "black",
+    "light gray",
+    "dark blue",
+    "white",
+    "light cyan",
+    "light red",
+    "light green",
+    "yellow",
+    "light magenta",
+)
+
+BG_FGS = [
+    ("dark red", RED_FGS),
+    ("dark green", GREEN_FGS),
+    ("brown", BROWN_FGS),
+    ("dark magenta", MAGENTA_FGS),
+]
+
+body = urwid.SimpleFocusListWalker([])
+
+for bg, fgs in BG_FGS:
+    spec = urwid.AttrSpec(fgs[0], bg)
+
+    body.extend(
+        (
+            urwid.AttrMap(urwid.Divider(), spec),
+            urwid.AttrMap(
+                urwid.GridFlow(
+                    (urwid.AttrMap(urwid.Text(f"'{fg}' on '{bg}'"), urwid.AttrSpec(fg, bg)) for fg in fgs),
+                    35,
+                    0,
+                    0,
+                    urwid.LEFT,
+                ),
+                spec,
+            ),
+            urwid.AttrMap(urwid.Divider(), spec),
+        )
+    )
+
+try:
+    urwid.MainLoop(urwid.ListBox(body)).run()
+except KeyboardInterrupt:
+    sys.exit(0)

urwid-2.6.0.post0/docs/manual/safe_combinations.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+
+from __future__ import annotations
+
+import sys
+
+import urwid
+
+BLACK_FGS = (
+    "light gray",
+    "dark cyan",
+    "dark red",
+    "dark green",
+    "dark magenta",
+    "white",
+    "light blue",
+    "light cyan",
+    "light red",
+    "light green",
+    "yellow",
+    "light magenta",
+)
+GRAY_FGS = (
+    "black",
+    "dark blue",
+    "dark cyan",
+    "dark red",
+    "dark green",
+    "dark magenta",
+    "white",
+    "light red",
+    "yellow",
+    "light magenta",
+)
+BLUE_FGS = (
+    "light gray",
+    "dark cyan",
+    "white",
+    "light cyan",
+    "light red",
+    "light green",
+    "yellow",
+    "light magenta",
+)
+CYAN_FGS = (
+    "black",
+    "light gray",
+    "dark blue",
+    "white",
+    "light cyan",
+    "light green",
+    "yellow",
+)
+
+BG_FGS = [
+    ("black", BLACK_FGS),
+    ("light gray", GRAY_FGS),
+    ("dark blue", BLUE_FGS),
+    ("dark cyan", CYAN_FGS),
+]
+
+body = urwid.SimpleFocusListWalker([])
+
+for bg, fgs in BG_FGS:
+    spec = urwid.AttrSpec(fgs[0], bg)
+
+    body.extend(
+        (
+            urwid.AttrMap(urwid.Divider(), spec),
+            urwid.AttrMap(
+                urwid.GridFlow(
+                    (urwid.AttrMap(urwid.Text(f"'{fg}' on '{bg}'"), urwid.AttrSpec(fg, bg)) for fg in fgs),
+                    35,
+                    0,
+                    0,
+                    urwid.LEFT,
+                ),
+                spec,
+            ),
+            urwid.AttrMap(urwid.Divider(), spec),
+        )
+    )
+
+try:
+    urwid.MainLoop(urwid.ListBox(body)).run()
+except KeyboardInterrupt:
+    sys.exit(0)

urwid-2.6.0.post0/docs/manual/wanat.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+import urwid
+
+
+class Pudding(urwid.Widget):
+    _sizing = frozenset((urwid.FLOW,))
+
+    def rows(self, size: tuple[int], focus: bool = False) -> int:
+        return 1
+
+    def render(self, size: tuple[int], focus: bool = False) -> urwid.TextCanvas:
+        (maxcol,) = size
+        num_pudding = maxcol // len("Pudding")
+        return urwid.TextCanvas([b"Pudding" * num_pudding], maxcol=maxcol)
+
+
+class BoxPudding(urwid.Widget):
+    _sizing = frozenset((urwid.BOX,))
+
+    def render(self, size: tuple[int, int], focus: bool = False) -> urwid.TextCanvas:
+        (maxcol, maxrow) = size
+        num_pudding = maxcol // len("Pudding")
+        return urwid.TextCanvas([b"Pudding" * num_pudding] * maxrow, maxcol=maxcol)

urwid-2.6.0.post0/docs/manual/wanat_multi.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+import urwid
+
+
+class MultiPudding(urwid.Widget):
+    _sizing = frozenset((urwid.FLOW, urwid.BOX))
+
+    def rows(self, size: tuple[int], focus: bool = False) -> int:
+        return 1
+
+    def render(self, size: tuple[int], focus: bool = False) -> urwid.TextCanvas:
+        if len(size) == 1:
+            (maxcol,) = size
+            maxrow = 1
+        else:
+            (maxcol, maxrow) = size
+        num_pudding = maxcol // len("Pudding")
+        return urwid.TextCanvas([b"Pudding" * num_pudding] * maxrow, maxcol=maxcol)

{urwid-2.5.3 → urwid-2.6.0.post0}/docs/manual/wcur1.py

@@ -11,23 +11,23 @@ class CursorPudding(urwid.Widget):
         super().__init__()
         self.cursor_col = 0
 
-    def rows(self, size, focus=False):
+    def rows(self, size: tuple[int], focus: bool = False) -> int:
         return 1
 
-    def render(self, size, focus=False):
+    def render(self, size: tuple[int], focus: bool = False) -> urwid.TextCanvas:
         (maxcol,) = size
-        num_pudding = maxcol / len("Pudding")
+        num_pudding = maxcol // len("Pudding")
         cursor = None
         if focus:
             cursor = self.get_cursor_coords(size)
-        return urwid.TextCanvas(["Pudding" * num_pudding], [], cursor, maxcol)
+        return urwid.TextCanvas([b"Pudding" * num_pudding], [], cursor=cursor, maxcol=maxcol)
 
-    def get_cursor_coords(self, size):
+    def get_cursor_coords(self, size: tuple[int]) -> tuple[int, int]:
         (maxcol,) = size
         col = min(self.cursor_col, maxcol - 1)
         return col, 0
 
-    def keypress(self, size, key):
+    def keypress(self, size: tuple[int], key: str) -> str | None:
         (maxcol,) = size
         if key == "left":
             col = self.cursor_col - 1
@@ -37,3 +37,4 @@ class CursorPudding(urwid.Widget):
             return key
         self.cursor_x = max(0, min(maxcol - 1, col))
         self._invalidate()
+        return None

urwid-2.6.0.post0/docs/manual/wcur2.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+import urwid
+
+
+class Widget(urwid.ListBox):
+    def get_pref_col(self, size: tuple[int, int]) -> int:
+        return self.cursor_x
+
+    def move_cursor_to_coords(self, size: tuple[int, int], col: int, row: int) -> bool:
+        assert row == 0  # noqa: S101  # in examples we can use `assert`
+        self.cursor_x = col
+        return True

{urwid-2.5.3 → urwid-2.6.0.post0}/docs/manual/wmod.py

@@ -3,16 +3,14 @@ from __future__ import annotations
 import urwid
 
 
-class QuestionnaireItem(urwid.WidgetWrap):
-    def __init__(self):
-        self.options = []
+class QuestionnaireItem(urwid.WidgetWrap[urwid.GridFlow]):
+    def __init__(self) -> None:
+        self.options: list[urwid.RadioButton] = []
         unsure = urwid.RadioButton(self.options, "Unsure")
         yes = urwid.RadioButton(self.options, "Yes")
         no = urwid.RadioButton(self.options, "No")
         display_widget = urwid.GridFlow([unsure, yes, no], 15, 3, 1, "left")
-        urwid.WidgetWrap.__init__(self, display_widget)
+        super().__init__(display_widget)
 
-    def get_state(self):
-        for o in self.options:
-            if o.get_state() is True:
-                return o.get_label()
+    def get_state(self) -> str:
+        return next(o.label for o in self.options if o.state is True)

{urwid-2.5.3 → urwid-2.6.0.post0}/docs/manual/wsel.py

@@ -4,28 +4,28 @@ import urwid
 
 
 class SelectablePudding(urwid.Widget):
-    _sizing = frozenset(["flow"])
+    _sizing = frozenset((urwid.FLOW,))
     _selectable = True
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self.pudding = "pudding"
 
-    def rows(self, size, focus=False):
+    def rows(self, size: tuple[int], focus: bool = False) -> int:
         return 1
 
-    def render(self, size, focus=False):
+    def render(self, size: tuple[int], focus: bool = False) -> urwid.TextCanvas:
         (maxcol,) = size
-        num_pudding = maxcol / len(self.pudding)
+        num_pudding = maxcol // len(self.pudding)
         pudding = self.pudding
         if focus:
             pudding = pudding.upper()
-        return urwid.TextCanvas([pudding * num_pudding], maxcol=maxcol)
+        return urwid.TextCanvas([pudding.encode("utf-8") * num_pudding], maxcol=maxcol)
 
-    def keypress(self, size, key):
-        (maxcol,) = size
+    def keypress(self, size: tuple[int], key: str) -> str | None:
         if len(key) > 1:
             return key
+
         if key.lower() in self.pudding:
             # remove letter from pudding
             n = self.pudding.index(key.lower())
@@ -33,5 +33,6 @@ class SelectablePudding(urwid.Widget):
             if not self.pudding:
                 self.pudding = "pudding"
             self._invalidate()
-        else:
-            return key
+            return None
+
+        return key