Make implementations of current_line and cursor_offset consistent

sebastinas · sebastinas · commit b86de33c1741 · 2022-05-04T10:59:00.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -383,13 +383,6 @@ def _get_cursor_offset(self) -> int:
     def _set_cursor_offset(self, offset: int) -> None:
         self.cpos = len(self.s) - offset
 
-    cursor_offset = property(
-        _get_cursor_offset,
-        _set_cursor_offset,
-        None,
-        "The cursor offset from the beginning of the line",
-    )
-
     def addstr(self, s: str) -> None:
         """Add a string to the current input line and figure out
         where it should go, depending on the cursor position."""
@@ -539,13 +532,6 @@ def _get_current_line(self) -> str:
     def _set_current_line(self, line: str) -> None:
         self.s = line
 
-    current_line = property(
-        _get_current_line,
-        _set_current_line,
-        None,
-        "The characters of the current line",
-    )
-
     def cut_to_buffer(self) -> None:
         """Clear from cursor to end of line, placing into cut buffer"""
         self.cut_buffer = self.s[-self.cpos :]
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1866,18 +1866,13 @@ def __repr__(self):
   lines scrolled down: {self.scroll_offset}
 >"""
 
-    @property
-    def current_line(self):
+    def _get_current_line(self) -> str:
         """The current line"""
         return self._current_line
 
-    @current_line.setter
-    def current_line(self, value):
-        self._set_current_line(value)
-
     def _set_current_line(
         self,
-        line,
+        line: str,
         update_completion=True,
         reset_rl_history=True,
         clear_special_mode=True,
@@ -1895,18 +1890,13 @@ def _set_current_line(
             self.special_mode = None
         self.unhighlight_paren()
 
-    @property
-    def cursor_offset(self):
+    def _get_cursor_offset(self) -> int:
         """The current cursor offset from the front of the "line"."""
         return self._cursor_offset
 
-    @cursor_offset.setter
-    def cursor_offset(self, value):
-        self._set_cursor_offset(value)
-
     def _set_cursor_offset(
         self,
-        offset,
+        offset: int,
         update_completion=True,
         reset_rl_history=False,
         clear_special_mode=True,
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -392,7 +392,7 @@ class _FuncExpr:
     keyword: Optional[str] = None
 
 
-class Repl:
+class Repl(metaclass=abc.ABCMeta):
     """Implements the necessary guff for a Python-repl-alike interface
 
     The execution of the code entered and all that stuff was taken from the
@@ -425,27 +425,51 @@ class Repl:
     XXX Subclasses should implement echo, current_line, cw
     """
 
-    if TYPE_CHECKING:
+    @abc.abstractmethod
+    def reevaluate(self):
+        pass
 
-        @property
-        @abstractmethod
-        def current_line(self) -> str:
-            pass
+    @abc.abstractmethod
+    def reprint_line(
+        self, lineno: int, tokens: List[Tuple[_TokenType, str]]
+    ) -> None:
+        pass
 
-        @property
-        @abstractmethod
-        def cursor_offset(self) -> int:
-            pass
+    @abc.abstractmethod
+    def _get_current_line(self) -> str:
+        pass
 
-        @abstractmethod
-        def reevaluate(self):
-            pass
+    @abc.abstractmethod
+    def _set_current_line(self, val: str) -> None:
+        pass
 
-        @abstractmethod
-        def reprint_line(
-            self, lineno: int, tokens: List[Tuple[_TokenType, str]]
-        ) -> None:
-            pass
+    @property
+    def current_line(self) -> str:
+        """The current line"""
+        return self._get_current_line()
+
+    @current_line.setter
+    def current_line(self, value: str) -> None:
+        self._set_current_line(value)
+
+    @abc.abstractmethod
+    def _get_cursor_offset(self) -> int:
+        pass
+
+    @abc.abstractmethod
+    def _set_cursor_offset(self, val: int) -> None:
+        pass
+
+    @property
+    def cursor_offset(self) -> int:
+        """The current cursor offset from the front of the "line"."""
+        return self._get_cursor_offset()
+
+    @cursor_offset.setter
+    def cursor_offset(self, value: int) -> None:
+        self._set_cursor_offset(value)
+
+    if TYPE_CHECKING:
 
         # not actually defined, subclasses must define
         cpos: int
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -5,6 +5,7 @@
 import tempfile
 import unittest
 
+from typing import List, Tuple
 from itertools import islice
 from pathlib import Path
 from unittest import mock
@@ -38,9 +39,32 @@ def reset(self):
 
 class FakeRepl(repl.Repl):
     def __init__(self, conf=None):
-        repl.Repl.__init__(self, repl.Interpreter(), setup_config(conf))
-        self.current_line = ""
-        self.cursor_offset = 0
+        super().__init__(repl.Interpreter(), setup_config(conf))
+        self._current_line = ""
+        self._cursor_offset = 0
+
+    def _get_current_line(self) -> str:
+        return self._current_line
+
+    def _set_current_line(self, val: str) -> None:
+        self._current_line = val
+
+    def _get_cursor_offset(self) -> int:
+        return self._cursor_offset
+
+    def _set_cursor_offset(self, val: int) -> None:
+        self._cursor_offset = val
+
+    def getstdout(self) -> str:
+        raise NotImplementedError
+
+    def reprint_line(
+        self, lineno: int, tokens: List[Tuple[repl._TokenType, str]]
+    ) -> None:
+        raise NotImplementedError
+
+    def reevaluate(self):
+        raise NotImplementedError
 
 
 class FakeCliRepl(cli.CLIRepl, FakeRepl):
