Fix mypy and formatting issues

ambv · May 31, 2024 · May 17, 2024 · May 18, 2024 · May 18, 2024 · May 18, 2024
commit b3f7092525cb4c68858b98a8d32ab6d6154d5c44
@@ -154,9 +154,9 @@ New Features
 A Better Interactive Interpreter
 --------------------------------
 
-On Unix-like systems like Linux or macOS as well as Windows, Python now 
-uses a new :term:`interactive` shell. When the user starts the 
-:term:`REPL` from an interactive terminal the interactive shell now 
+On Unix-like systems like Linux or macOS as well as Windows, Python now
+uses a new :term:`interactive` shell. When the user starts the
+:term:`REPL` from an interactive terminal the interactive shell now
 supports the following new features:
 
 * Colorized prompts.

@@ -39,11 +39,26 @@
     WCHAR,
     SHORT,
 )
-from ctypes import Structure, POINTER, Union, WinDLL
+from ctypes import Structure, POINTER, Union
 from ctypes import windll
 from typing import TYPE_CHECKING
 from .utils import wlen
 
+try:
+    from ctypes import GetLastError, WinError, WinDLL, windll
+except:
+    # Keep MyPy happy off Windows
+    from ctypes import CDLL as WinDLL, cdll as windll
+
+    def GetLastError() -> int:
+        return 42
+
+    class WinError(OSError):
+        def __init__(self, err: int|None, descr: str|None = None) -> None:
+            self.err = err
+            self.descr = descr
+
+
 if TYPE_CHECKING:
     from typing import IO
 
@@ -117,6 +132,10 @@ def __init__(
         else:
             self.output_fd = f_out.fileno()
 
+        self.screen: List[str] = []
+        self.width = 80
+        self.height = 25
+        self.__offset = 0
         self.event_queue: deque[Event] = deque()
 
     def refresh(self, screen: list[str], c_xy: tuple[int, int]) -> None:
@@ -251,25 +270,25 @@ def scroll(
         if not ScrollConsoleScreenBuffer(
             OutHandle, scroll_rect, None, destination_origin, fill_info
         ):
-            raise ctypes.WinError(ctypes.GetLastError())
+            raise WinError(GetLastError())
 
     def __hide_cursor(self) -> None:
         info = CONSOLE_CURSOR_INFO()
         if not GetConsoleCursorInfo(OutHandle, info):
-            raise ctypes.WinError(ctypes.GetLastError())
+            raise WinError(GetLastError())
 
         info.bVisible = False
         if not SetConsoleCursorInfo(OutHandle, info):
-            raise ctypes.WinError(ctypes.GetLastError())
+            raise WinError(GetLastError())
 
     def __show_cursor(self) -> None:
         info = CONSOLE_CURSOR_INFO()
         if not GetConsoleCursorInfo(OutHandle, info):
-            raise ctypes.WinError(ctypes.GetLastError())
+            raise WinError(GetLastError())
 
         info.bVisible = True
         if not SetConsoleCursorInfo(OutHandle, info):
-            raise ctypes.WinError(ctypes.GetLastError())
+            raise WinError(GetLastError())
 
     def __write(self, text: str) -> None:
         print(repr(text))
@@ -279,7 +298,7 @@ def __write(self, text: str) -> None:
     def screen_xy(self) -> tuple[int, int]:
         info = CONSOLE_SCREEN_BUFFER_INFO()
         if not GetConsoleScreenBufferInfo(OutHandle, info):
-            raise ctypes.WinError(ctypes.GetLastError())
+            raise WinError(GetLastError())
         return info.dwCursorPosition.X, info.dwCursorPosition.Y
 
     def erase_to_end(self) -> None:
@@ -340,7 +359,7 @@ def getheightwidth(self) -> tuple[int, int]:
         and width of the terminal window in characters."""
         info = CONSOLE_SCREEN_BUFFER_INFO()
         if not GetConsoleScreenBufferInfo(OutHandle, info):
-            raise ctypes.WinError(ctypes.GetLastError())
+            raise WinError(GetLastError())
         return (
             info.srWindow.Bottom - info.srWindow.Top + 1,
             info.srWindow.Right - info.srWindow.Left + 1,
@@ -349,15 +368,15 @@ def getheightwidth(self) -> tuple[int, int]:
     def getscrollbacksize(self) -> int:
         info = CONSOLE_SCREEN_BUFFER_INFO()
         if not GetConsoleScreenBufferInfo(OutHandle, info):
-            raise ctypes.WinError(ctypes.GetLastError())
+            raise WinError(GetLastError())
 
         return info.srWindow.Bottom
 
     def __read_input(self) -> INPUT_RECORD | None:
         rec = INPUT_RECORD()
         read = DWORD()
         if not ReadConsoleInput(InHandle, rec, 1, read):
-            raise ctypes.WinError(ctypes.GetLastError())
+            raise WinError(GetLastError())
 
         if read.value == 0:
             return None

@@ -1,15 +1,8 @@
 import itertools
 import sys
 import unittest
-from Lib._pyrepl.windows_console import ERASE_IN_LINE
 from _pyrepl.console import Event, Console
-from _pyrepl.windows_console import (
-    MOVE_LEFT,
-    MOVE_RIGHT,
-    MOVE_UP,
-    MOVE_DOWN,
-    ERASE_IN_LINE,
-)
+from _pyrepl.windows_console import MOVE_LEFT, MOVE_RIGHT, MOVE_UP, MOVE_DOWN, ERASE_IN_LINE
 from functools import partial
 from typing import Iterable
 from unittest import TestCase, main
@@ -23,7 +16,6 @@
 except ImportError:
     pass
 
-
 @patch("os.write")
 @unittest.skipIf(sys.platform != "win32", "No Unix event queue on Windows")
 class WindowsConsoleTests(TestCase):
@@ -46,16 +38,16 @@ def console(self, events, **kwargs) -> Console:
 
     def handle_events(self, events: Iterable[Event], **kwargs):
         return handle_all_events(events, partial(self.console, **kwargs))
-
+    
     def handle_events_narrow(self, events):
         return self.handle_events(events, width=5)
-
+    
     def handle_events_short(self, events):
         return self.handle_events(events, height=1)
-
+    
     def handle_events_height_3(self, events):
         return self.handle_events(events, height=3)
-
+    
     def test_simple_addition(self, _os_write):
         code = "12+34"
         events = code_to_events(code)
@@ -130,8 +122,8 @@ def same_console(events):
             prepare_console=same_console,
         )
 
-        _os_write.assert_any_call(ANY, b"456\\")
-        _os_write.assert_any_call(ANY, b"789\\")
+        _os_write.assert_any_call(ANY, b'456\\')
+        _os_write.assert_any_call(ANY, b'789\\')
 
         con.restore()
 
@@ -323,10 +315,9 @@ def move_left(self, cols=1):
 
     def move_right(self, cols=1):
         return MOVE_RIGHT.format(cols).encode("utf8")
-
+    
     def erase_in_line(self):
         return ERASE_IN_LINE.encode("utf8")
 
-
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()