Change the type to CursorAwareWindow

sebastinas · sebastinas · commit 8d16a71ef404 · 2022-05-06T00:02:30.000+02:00
Pass None in the tests. This is good enough.
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -36,7 +36,7 @@
 )
 from curtsies.configfile_keynames import keymap as key_dispatch
 from curtsies.input import is_main_thread
-from curtsies.window import BaseWindow
+from curtsies.window import CursorAwareWindow
 from cwcwidth import wcswidth
 from pygments import format as pygformat
 from pygments.formatters import TerminalFormatter
@@ -326,7 +326,7 @@ class BaseRepl(Repl):
     def __init__(
         self,
         config: Config,
-        window: Optional[BaseWindow] = None,
+        window: CursorAwareWindow,
         locals_: Optional[Dict[str, Any]] = None,
         banner: Optional[str] = None,
         interp: Optional[Interp] = None,
diff --git a/bpython/test/test_brackets_completion.py b/bpython/test/test_brackets_completion.py
@@ -1,9 +1,12 @@
 import os
+from typing import cast
 
 from bpython.test import FixLanguageTestCase as TestCase, TEST_CONFIG
 from bpython.curtsiesfrontend import repl as curtsiesrepl
 from bpython import config
 
+from curtsies.window import CursorAwareWindow
+
 
 def setup_config(conf):
     config_struct = config.Config(TEST_CONFIG)
@@ -18,7 +21,9 @@ def create_repl(brackets_enabled=False, **kwargs):
     config = setup_config(
         {"editor": "true", "brackets_completion": brackets_enabled}
     )
-    repl = curtsiesrepl.BaseRepl(config, **kwargs)
+    repl = curtsiesrepl.BaseRepl(
+        config, cast(None, CursorAwareWindow), **kwargs
+    )
     os.environ["PAGER"] = "true"
     os.environ.pop("PYTHONSTARTUP", None)
     repl.width = 50
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -5,12 +5,14 @@
 import sys
 
 from contextlib import contextmanager
+from typing import cast
 from curtsies.formatstringarray import (
     fsarray,
     assertFSArraysEqual,
     assertFSArraysEqualIgnoringFormatting,
 )
 from curtsies.fmtfuncs import cyan, bold, green, yellow, on_magenta, red
+from curtsies.window import CursorAwareWindow
 from unittest import mock
 
 from bpython.curtsiesfrontend.events import RefreshRequestEvent
@@ -56,7 +58,7 @@ class TestRepl(BaseRepl):
             def _request_refresh(inner_self):
                 pass
 
-        self.repl = TestRepl(config=setup_config())
+        self.repl = TestRepl(setup_config(), cast(None, CursorAwareWindow))
         self.repl.height, self.repl.width = (5, 10)
 
     @property
@@ -284,7 +286,9 @@ class TestRepl(BaseRepl):
             def _request_refresh(inner_self):
                 self.refresh()
 
-        self.repl = TestRepl(banner="", config=setup_config())
+        self.repl = TestRepl(
+            setup_config(), cast(None, CursorAwareWindow), banner=""
+        )
         self.repl.height, self.repl.width = (5, 32)
 
     def send_key(self, key):
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -3,6 +3,7 @@
 import sys
 import tempfile
 import io
+from typing import cast
 import unittest
 
 from contextlib import contextmanager
@@ -23,6 +24,7 @@
 )
 
 from curtsies import events
+from curtsies.window import CursorAwareWindow
 from importlib import invalidate_caches
 
 
@@ -231,7 +233,9 @@ def captured_output():
 
 def create_repl(**kwargs):
     config = setup_config({"editor": "true"})
-    repl = curtsiesrepl.BaseRepl(config, **kwargs)
+    repl = curtsiesrepl.BaseRepl(
+        config, cast(CursorAwareWindow, None), **kwargs
+    )
     os.environ["PAGER"] = "true"
     os.environ.pop("PYTHONSTARTUP", None)
     repl.width = 50
