Fix compatibility with urwid 3.0 (fixes bpython#1043)

sebastinas · sebastinas · commit bbc9438a2638 · 2025-10-28T23:12:28.000+01:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,7 +32,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-          pip install "urwid < 3.0" twisted watchdog "jedi >=0.16" babel "sphinx >=1.5"
+          pip install "urwid >= 1.0" twisted watchdog "jedi >=0.16" babel "sphinx >=1.5"
           pip install pytest pytest-cov numpy
       - name: Build with Python ${{ matrix.python-version }}
         run: |
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -411,7 +411,7 @@ def keypress(self, size, key):
         return key
 
 
-class Tooltip(urwid.BoxWidget):
+class Tooltip(urwid.Widget):
     """Container inspired by Overlay to position our tooltip.
 
     bottom_w should be a BoxWidget.
@@ -423,6 +423,9 @@ class Tooltip(urwid.BoxWidget):
     from the bottom window and hides it if there is no cursor.
     """
 
+    _sizing = frozenset(['box'])
+    _selectable = True
+
     def __init__(self, bottom_w, listbox):
         super().__init__()
 
@@ -1322,7 +1325,8 @@ def run_find_coroutine():
 
         run_find_coroutine()
 
-    myrepl.main_loop.screen.run_wrapper(run_with_screen_before_mainloop)
+    with myrepl.main_loop.screen.start():
+        run_with_screen_before_mainloop()
 
     if config.flush_output and not options.quiet:
         sys.stdout.write(myrepl.getstdout())
diff --git a/setup.cfg b/setup.cfg
@@ -35,7 +35,7 @@ install_requires =
 [options.extras_require]
 clipboard = pyperclip
 jedi = jedi >= 0.16
-urwid = urwid >=1.0,< 3.0
+urwid = urwid >=1.0
 watch = watchdog
 
 [options.entry_points]
