From: Marcus MERIGHI <mcmer-openbsd@tor.at>
Subject: update: devel/py-urwid
To: ports@openbsd.org
Cc: Clem Atis <clematis@insiberia.net>, Joerg Jung <jung@openbsd.org>
Date: Sat, 10 Feb 2024 18:53:33 +0100

Hello, 

there was some traffic on the urwid mailing list recently, so I checked
out the version we have versus upstream and we are behind.

I prepared and inlined an update from 2.0.1 to 2.5.2.

Previous art, sthen@ update 2.0.1 -> 2.3.4, 2023-12-29:
        https://marc.info/?l=openbsd-ports&m=170384668306349

3 ports are listed in "Required by:"; I've recompiled them and lightly
runtime tested them, not all is good: 

1) toot - reading toots, viewing details works. Posting not tested.
2) urlscan - opening URLs in mutt(1) worked.
3) khal - ikhal viewing works, adding a new appointment *did not* work:

        urwid.widget.widget.WidgetError: Widget <Padding selectable
        fixed/flow widget <CalendarPopUp selectable flow widget
        <ValidatedEdit selectable flow widget>> right=1 width=11>
        rendered (11 x 1) canvas when passed size (10,)!

This is a show stopper to me, I've CC:ed MAINTAINER jung@.

The changelog is here:
https://urwid.org/changelog.html

I compared the sha256 of the download with the one given here, it matches: 
https://pypi.org/project/urwid/#copy-hash-modal-e247856e-1894-4990-a3d9-606845b3f9b6

Marcus


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-urwid/Makefile,v
retrieving revision 1.38
diff -u -p -u -r1.38 Makefile
--- Makefile	26 Nov 2022 15:02:57 -0000	1.38
+++ Makefile	10 Feb 2024 17:15:50 -0000
@@ -1,11 +1,11 @@
 COMMENT =	console user interface library for python
 
-MODPY_EGG_VERSION = 2.0.1
+MODPY_EGG_VERSION = 2.5.2
 DISTNAME =	urwid-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	devel
 EPOCH =		0
-REVISION =	6
 
 HOMEPAGE =	http://urwid.org/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-urwid/distinfo,v
retrieving revision 1.10
diff -u -p -u -r1.10 distinfo
--- distinfo	7 Jan 2020 12:09:00 -0000	1.10
+++ distinfo	10 Feb 2024 17:15:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (urwid-2.0.1.tar.gz) = ZE0+OQCGcWGi/JKHqXYnU9Zr0ZR1Rnmtsmrt5Vm8zLw=
-SIZE (urwid-2.0.1.tar.gz) = 604167
+SHA256 (urwid-2.5.2.tar.gz) = c518ad40d956e867ecaf9444bffff35564eea35ef20e970f7e70a17d4accfa02
+SIZE (urwid-2.5.2.tar.gz) = 842160
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-urwid/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -u -r1.11 PLIST
--- pkg/PLIST	26 Nov 2022 15:02:57 -0000	1.11
+++ pkg/PLIST	10 Feb 2024 17:15:50 -0000
@@ -14,36 +14,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}canvas.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}command_map.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}command_map.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}curses_display.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}curses_display.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}decoration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}decoration.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}display_common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}display_common.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}escape.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}escape.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}font.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}font.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}graphics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}graphics.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}html_fragment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}html_fragment.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}lcd_display.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}lcd_display.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}listbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}listbox.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}main_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}main_loop.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}monitored_list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}monitored_list.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}numedit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}numedit.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}old_str_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}old_str_util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}raw_display.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}raw_display.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}split_repr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -58,81 +44,177 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}vterm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}vterm.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}web_display.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}web_display.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}widget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}widget.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}wimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}wimp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urwid/canvas.py
 lib/python${MODPY_VERSION}/site-packages/urwid/command_map.py
-lib/python${MODPY_VERSION}/site-packages/urwid/compat.py
 lib/python${MODPY_VERSION}/site-packages/urwid/container.py
-lib/python${MODPY_VERSION}/site-packages/urwid/curses_display.py
 lib/python${MODPY_VERSION}/site-packages/urwid/decoration.py
-lib/python${MODPY_VERSION}/site-packages/urwid/display_common.py
-lib/python${MODPY_VERSION}/site-packages/urwid/escape.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/
+lib/python${MODPY_VERSION}/site-packages/urwid/display/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}_posix_raw_display.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}_posix_raw_display.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}_raw_display_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}_raw_display_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}_win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}_win32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}_win32_raw_display.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}_win32_raw_display.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}curses.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}curses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}escape.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}escape.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}html_fragment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}html_fragment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}lcd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}lcd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}web.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/display/${MODPY_PYCACHE}web.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/display/_posix_raw_display.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/_raw_display_base.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/_web.css
+lib/python${MODPY_VERSION}/site-packages/urwid/display/_web.js
+lib/python${MODPY_VERSION}/site-packages/urwid/display/_win32.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/_win32_raw_display.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/common.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/curses.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/escape.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/html_fragment.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/lcd.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/raw.py
+lib/python${MODPY_VERSION}/site-packages/urwid/display/web.py
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}abstract_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}abstract_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}asyncio_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}asyncio_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}glib_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}glib_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}main_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}main_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}select_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}select_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}tornado_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}tornado_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}trio_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}trio_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}twisted_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}twisted_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}zmq_loop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/${MODPY_PYCACHE}zmq_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/abstract_loop.py
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/asyncio_loop.py
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/glib_loop.py
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/main_loop.py
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/select_loop.py
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/tornado_loop.py
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/trio_loop.py
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/twisted_loop.py
+lib/python${MODPY_VERSION}/site-packages/urwid/event_loop/zmq_loop.py
 lib/python${MODPY_VERSION}/site-packages/urwid/font.py
 lib/python${MODPY_VERSION}/site-packages/urwid/graphics.py
-lib/python${MODPY_VERSION}/site-packages/urwid/html_fragment.py
-lib/python${MODPY_VERSION}/site-packages/urwid/lcd_display.py
+lib/python${MODPY_VERSION}/site-packages/urwid/highlight.css
 lib/python${MODPY_VERSION}/site-packages/urwid/listbox.py
-lib/python${MODPY_VERSION}/site-packages/urwid/main_loop.py
 lib/python${MODPY_VERSION}/site-packages/urwid/monitored_list.py
+lib/python${MODPY_VERSION}/site-packages/urwid/numedit.py
 lib/python${MODPY_VERSION}/site-packages/urwid/old_str_util.py
-lib/python${MODPY_VERSION}/site-packages/urwid/raw_display.py
 lib/python${MODPY_VERSION}/site-packages/urwid/signals.py
 lib/python${MODPY_VERSION}/site-packages/urwid/split_repr.py
-@so lib/python${MODPY_VERSION}/site-packages/urwid/str_util.${MODPY_PYC_MAGIC_TAG}so
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_canvas.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_canvas.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_container.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_container.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_decoration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_decoration.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_doctests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_doctests.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_event_loops.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_event_loops.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_graphics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_graphics.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_listbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_listbox.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_str_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_str_util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_text_layout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_text_layout.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_vterm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_vterm.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_widget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_widget.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_canvas.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_container.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_decoration.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_doctests.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_event_loops.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_graphics.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_listbox.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_str_util.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_text_layout.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_util.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_vterm.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_widget.py
-lib/python${MODPY_VERSION}/site-packages/urwid/tests/util.py
+@so lib/python${MODPY_VERSION}/site-packages/urwid/str_util${MODPY_ABI3SO}.so
 lib/python${MODPY_VERSION}/site-packages/urwid/text_layout.py
 lib/python${MODPY_VERSION}/site-packages/urwid/treetools.py
 lib/python${MODPY_VERSION}/site-packages/urwid/util.py
 lib/python${MODPY_VERSION}/site-packages/urwid/version.py
 lib/python${MODPY_VERSION}/site-packages/urwid/vterm.py
-lib/python${MODPY_VERSION}/site-packages/urwid/web_display.py
-lib/python${MODPY_VERSION}/site-packages/urwid/widget.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}attr_map.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}attr_map.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}attr_wrap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}attr_wrap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}bar_graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}bar_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}big_text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}big_text.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}box_adapter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}box_adapter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}columns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}columns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}divider.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}divider.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}edit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}edit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}filler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}filler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}frame.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}frame.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}grid_flow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}grid_flow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}line_box.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}line_box.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}overlay.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}overlay.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}padding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}padding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}pile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}pile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}popup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}popup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}progress_bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}progress_bar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}scrollable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}scrollable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}solid_fill.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}solid_fill.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}widget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}widget.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}widget_decoration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}widget_decoration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}wimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/${MODPY_PYCACHE}wimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/attr_map.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/attr_wrap.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/bar_graph.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/big_text.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/box_adapter.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/columns.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/constants.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/container.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/divider.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/edit.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/filler.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/frame.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/grid_flow.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/line_box.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/overlay.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/padding.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/pile.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/popup.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/progress_bar.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/scrollable.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/solid_fill.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/text.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/widget.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/widget_decoration.py
+lib/python${MODPY_VERSION}/site-packages/urwid/widget/wimp.py
 lib/python${MODPY_VERSION}/site-packages/urwid/wimp.py