Make Interaction an abstract base class

sebastinas · sebastinas · commit 8caa915e2f0f · 2022-05-04T00:27:39.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -319,14 +319,14 @@ def make_colors(config: Config) -> Dict[str, int]:
 
 
 class CLIInteraction(repl.Interaction):
-    def __init__(self, config: Config, statusbar: Optional["Statusbar"] = None):
-        super().__init__(config, statusbar)
+    def __init__(self, config: Config, statusbar: "Statusbar"):
+        super().__init__(config)
+        self.statusbar = statusbar
 
     def confirm(self, q: str) -> bool:
         """Ask for yes or no and return boolean"""
         try:
-            if self.statusbar:
-                reply = self.statusbar.prompt(q)
+            reply = self.statusbar.prompt(q)
         except ValueError:
             return False
 
@@ -335,14 +335,10 @@ def confirm(self, q: str) -> bool:
     def notify(
         self, s: str, n: int = 10, wait_for_keypress: bool = False
     ) -> None:
-        if self.statusbar:
-            self.statusbar.message(s, n)
+        self.statusbar.message(s, n)
 
     def file_prompt(self, s: str) -> Optional[str]:
-        if self.statusbar:
-            return self.statusbar.prompt(s)
-        else:
-            return None
+        return self.statusbar.prompt(s)
 
 
 class CLIRepl(repl.Repl):
@@ -1675,7 +1671,7 @@ def check(self) -> None:
 
         self.settext(self._s)
 
-    def message(self, s: str, n: int = 3) -> None:
+    def message(self, s: str, n: float = 3.0) -> None:
         """Display a message for a short n seconds on the statusbar and return
         it to its original state."""
         self.timer = int(time.time() + n)
diff --git a/bpython/curtsiesfrontend/interaction.py b/bpython/curtsiesfrontend/interaction.py
@@ -39,7 +39,7 @@ def __init__(
         self.prompt = ""
         self._message = ""
         self.message_start_time = time.time()
-        self.message_time = 3
+        self.message_time = 3.0
         self.permanent_stack = []
         if permanent_text:
             self.permanent_stack.append(permanent_text)
@@ -149,7 +149,7 @@ def should_show_message(self):
         return bool(self.current_line)
 
     # interaction interface - should be called from other greenlets
-    def notify(self, msg, n=3, wait_for_keypress=False):
+    def notify(self, msg, n=3.0, wait_for_keypress=False):
         self.request_context = greenlet.getcurrent()
         self.message_time = n
         self.message(msg, schedule_refresh=wait_for_keypress)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -21,6 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+import abc
 import code
 import inspect
 import os
@@ -346,21 +347,39 @@ def clear(self) -> None:
         self.index = -1
 
 
-class Interaction:
-    def __init__(self, config: Config, statusbar: Optional["Statusbar"] = None):
+class Interaction(metaclass=abc.ABCMeta):
+    def __init__(self, config: Config):
         self.config = config
 
-        if statusbar:
-            self.statusbar = statusbar
+    @abc.abstractmethod
+    def confirm(self, s: str) -> bool:
+        pass
 
-    def confirm(self, s):
-        raise NotImplementedError
+    @abc.abstractmethod
+    def notify(
+        self, s: str, n: float = 10.0, wait_for_keypress: bool = False
+    ) -> None:
+        pass
+
+    @abc.abstractmethod
+    def file_prompt(self, s: str) -> Optional[str]:
+        pass
+
+
+class NoInteraction(Interaction):
+    def __init__(self, config: Config):
+        super().__init__(config)
 
-    def notify(self, s, n=10, wait_for_keypress=False):
-        raise NotImplementedError
+    def confirm(self, s: str) -> bool:
+        return False
+
+    def notify(
+        self, s: str, n: float = 10.0, wait_for_keypress: bool = False
+    ) -> None:
+        pass
 
-    def file_prompt(self, s):
-        raise NotImplementedError
+    def file_prompt(self, s: str) -> Optional[str]:
+        return None
 
 
 class SourceNotFound(Exception):
@@ -458,7 +477,7 @@ def __init__(self, interp: Interpreter, config: Config):
         ] = None
         self._C: Dict[str, int] = {}
         self.prev_block_finished: int = 0
-        self.interact = Interaction(self.config)
+        self.interact: Interaction = NoInteraction(self.config)
         # previous pastebin content to prevent duplicate pastes, filled on call
         # to repl.pastebin
         self.prev_pastebin_content = ""
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -38,6 +38,7 @@
 import locale
 import signal
 import urwid
+from typing import Optional
 
 from . import args as bpargs, repl, translations
 from .formatter import theme_map
@@ -526,7 +527,8 @@ def render(self, size, focus=False):
 
 class URWIDInteraction(repl.Interaction):
     def __init__(self, config, statusbar, frame):
-        super().__init__(config, statusbar)
+        super().__init__(config)
+        self.statusbar = statusbar
         self.frame = frame
         urwid.connect_signal(statusbar, "prompt_result", self._prompt_result)
         self.callback = None
@@ -563,6 +565,9 @@ def _prompt_result(self, text):
             self.callback = None
             callback(text)
 
+    def file_prompt(self, s: str) -> Optional[str]:
+        raise NotImplementedError
+
 
 class URWIDRepl(repl.Repl):
 
