Fix typing issues

rich/_win32_console.py

@@ -1,8 +1,9 @@
 """Light wrapper around the win32 Console API - this module should only be imported on Windows"""
 import ctypes
 import sys
-from typing import IO, NamedTuple, Type, cast
+from typing import IO, Any, NamedTuple, Type, cast
 
+windll: Any = None
 if sys.platform == "win32":
     windll = ctypes.LibraryLoader(ctypes.WinDLL)
 else:
@@ -18,7 +19,6 @@
 STDOUT = -11
 ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4
 
-kernel32 = windll.kernel32
 COORD = wintypes._COORD
 
 
@@ -51,7 +51,7 @@ class CONSOLE_CURSOR_INFO(ctypes.Structure):
     _fields_ = [("dwSize", wintypes.DWORD), ("bVisible", wintypes.BOOL)]
 
 
-_GetStdHandle = kernel32.GetStdHandle
+_GetStdHandle = windll.kernel32.GetStdHandle
 _GetStdHandle.argtypes = [
     wintypes.DWORD,
 ]
@@ -62,7 +62,7 @@ def GetStdHandle(handle: int = STDOUT) -> wintypes.HANDLE:
     return cast(wintypes.HANDLE, _GetStdHandle(handle))
 
 
-_GetConsoleMode = kernel32.GetConsoleMode
+_GetConsoleMode = windll.kernel32.GetConsoleMode
 _GetConsoleMode.argtypes = [wintypes.HANDLE, wintypes.LPDWORD]
 _GetConsoleMode.restype = wintypes.BOOL
 
@@ -71,7 +71,7 @@ def GetConsoleMode(std_handle: wintypes.HANDLE, console_mode: wintypes.DWORD) ->
     return bool(_GetConsoleMode(std_handle, console_mode))
 
 
-_FillConsoleOutputCharacterW = kernel32.FillConsoleOutputCharacterW
+_FillConsoleOutputCharacterW = windll.kernel32.FillConsoleOutputCharacterW
 _FillConsoleOutputCharacterW.argtypes = [
     wintypes.HANDLE,
     ctypes.c_char,
@@ -103,7 +103,7 @@ def FillConsoleOutputCharacter(
     return num_written.value
 
 
-_FillConsoleOutputAttribute = kernel32.FillConsoleOutputAttribute
+_FillConsoleOutputAttribute = windll.kernel32.FillConsoleOutputAttribute
 _FillConsoleOutputAttribute.argtypes = [
     wintypes.HANDLE,
     wintypes.WORD,
@@ -129,7 +129,7 @@ def FillConsoleOutputAttribute(
     return num_written.value
 
 
-_SetConsoleTextAttribute = kernel32.SetConsoleTextAttribute
+_SetConsoleTextAttribute = windll.kernel32.SetConsoleTextAttribute
 _SetConsoleTextAttribute.argtypes = [
     wintypes.HANDLE,
     wintypes.WORD,
@@ -143,7 +143,7 @@ def SetConsoleTextAttribute(
     return bool(_SetConsoleTextAttribute(std_handle, attributes))
 
 
-_GetConsoleScreenBufferInfo = kernel32.GetConsoleScreenBufferInfo
+_GetConsoleScreenBufferInfo = windll.kernel32.GetConsoleScreenBufferInfo
 _GetConsoleScreenBufferInfo.argtypes = [
     wintypes.HANDLE,
     ctypes.POINTER(CONSOLE_SCREEN_BUFFER_INFO),
@@ -159,7 +159,7 @@ def GetConsoleScreenBufferInfo(
     return console_screen_buffer_info
 
 
-_SetConsoleCursorPosition = kernel32.SetConsoleCursorPosition
+_SetConsoleCursorPosition = windll.kernel32.SetConsoleCursorPosition
 _SetConsoleCursorPosition.argtypes = [
     wintypes.HANDLE,
     cast(Type[COORD], WindowsCoordinates),
@@ -173,7 +173,7 @@ def SetConsoleCursorPosition(
     return bool(_SetConsoleCursorPosition(std_handle, coords))
 
 
-_SetConsoleCursorInfo = kernel32.SetConsoleCursorInfo
+_SetConsoleCursorInfo = windll.kernel32.SetConsoleCursorInfo
 _SetConsoleCursorInfo.argtypes = [
     wintypes.HANDLE,
     ctypes.POINTER(CONSOLE_CURSOR_INFO),
@@ -187,7 +187,7 @@ def SetConsoleCursorInfo(
     return bool(_SetConsoleCursorInfo(std_handle, byref(cursor_info)))
 
 
-_SetConsoleTitle = kernel32.SetConsoleTitleW
+_SetConsoleTitle = windll.kernel32.SetConsoleTitleW
 _SetConsoleTitle.argtypes = [wintypes.LPCWSTR]
 _SetConsoleTitle.restype = wintypes.BOOL
 

tests/test_win32_console.py

@@ -10,8 +10,8 @@
 
 if sys.platform == "win32":
 
-    from rich._win32_console import COORD, LegacyWindowsTerm, WindowsCoordinates
     from rich import _win32_console
+    from rich._win32_console import COORD, LegacyWindowsTerm, WindowsCoordinates
 
     CURSOR_X = 1
     CURSOR_Y = 2
@@ -20,45 +20,40 @@
     SCREEN_HEIGHT = 30
     DEFAULT_STYLE_ATTRIBUTE = 16
 
-
     @dataclasses.dataclass
     class StubScreenBufferInfo:
         dwCursorPosition: COORD = COORD(CURSOR_X, CURSOR_Y)
         dwSize: COORD = COORD(SCREEN_WIDTH, SCREEN_HEIGHT)
         wAttributes: int = DEFAULT_STYLE_ATTRIBUTE
 
-
     pytestmark = pytest.mark.skipif(sys.platform != "win32", reason="windows only")
 
-
     def test_windows_coordinates_to_ctype():
         coord = WindowsCoordinates.from_param(WindowsCoordinates(row=1, col=2))
         assert coord.X == 2
         assert coord.Y == 1
 
-
     @pytest.fixture
     def win32_handle():
         handle = mock.sentinel
         with mock.patch.object(_win32_console, "GetStdHandle", return_value=handle):
             yield handle
 
-
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
     )
     def test_cursor_position(_):
         term = LegacyWindowsTerm()
         assert term.cursor_position == WindowsCoordinates(row=CURSOR_Y, col=CURSOR_X)
 
-
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
     )
     def test_screen_size(_):
         term = LegacyWindowsTerm()
-        assert term.screen_size == WindowsCoordinates(row=SCREEN_HEIGHT, col=SCREEN_WIDTH)
-
+        assert term.screen_size == WindowsCoordinates(
+            row=SCREEN_HEIGHT, col=SCREEN_WIDTH
+        )
 
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -72,7 +67,6 @@ def test_write_text(_):
 
         assert f.getvalue() == text
 
-
     @patch.object(_win32_console, "SetConsoleTextAttribute")
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -93,14 +87,13 @@ def test_write_styled(_, SetConsoleTextAttribute, win32_handle):
         assert call_args[0].kwargs["attributes"].value == 64
         assert call_args[1] == call(win32_handle, attributes=DEFAULT_STYLE_ATTRIBUTE)
 
-
     @patch.object(_win32_console, "FillConsoleOutputCharacter", return_value=None)
     @patch.object(_win32_console, "FillConsoleOutputAttribute", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
     )
     def test_erase_line(
-            _, FillConsoleOutputAttribute, FillConsoleOutputCharacter, win32_handle
+        _, FillConsoleOutputAttribute, FillConsoleOutputCharacter, win32_handle
     ):
         term = LegacyWindowsTerm()
         term.erase_line()
@@ -112,14 +105,13 @@ def test_erase_line(
             win32_handle, DEFAULT_STYLE_ATTRIBUTE, length=SCREEN_WIDTH, start=start
         )
 
-
     @patch.object(_win32_console, "FillConsoleOutputCharacter", return_value=None)
     @patch.object(_win32_console, "FillConsoleOutputAttribute", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
     )
     def test_erase_end_of_line(
-            _, FillConsoleOutputAttribute, FillConsoleOutputCharacter, win32_handle
+        _, FillConsoleOutputAttribute, FillConsoleOutputCharacter, win32_handle
     ):
         term = LegacyWindowsTerm()
         term.erase_end_of_line()
@@ -134,14 +126,13 @@ def test_erase_end_of_line(
             start=CURSOR_POSITION,
         )
 
-
     @patch.object(_win32_console, "FillConsoleOutputCharacter", return_value=None)
     @patch.object(_win32_console, "FillConsoleOutputAttribute", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
     )
     def test_erase_start_of_line(
-            _, FillConsoleOutputAttribute, FillConsoleOutputCharacter, win32_handle
+        _, FillConsoleOutputAttribute, FillConsoleOutputCharacter, win32_handle
     ):
         term = LegacyWindowsTerm()
         term.erase_start_of_line()
@@ -155,7 +146,6 @@ def test_erase_start_of_line(
             win32_handle, DEFAULT_STYLE_ATTRIBUTE, length=CURSOR_X, start=start
         )
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -168,33 +158,34 @@ def test_move_cursor_to(_, SetConsoleCursorPosition, win32_handle):
 
         SetConsoleCursorPosition.assert_called_once_with(win32_handle, coords=coords)
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
     )
-    def test_move_cursor_to_out_of_bounds_row(_, SetConsoleCursorPosition, win32_handle):
+    def test_move_cursor_to_out_of_bounds_row(
+        _, SetConsoleCursorPosition, win32_handle
+    ):
         coords = WindowsCoordinates(row=-1, col=4)
         term = LegacyWindowsTerm()
 
         term.move_cursor_to(coords)
 
         assert not SetConsoleCursorPosition.called
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
     )
-    def test_move_cursor_to_out_of_bounds_col(_, SetConsoleCursorPosition, win32_handle):
+    def test_move_cursor_to_out_of_bounds_col(
+        _, SetConsoleCursorPosition, win32_handle
+    ):
         coords = WindowsCoordinates(row=10, col=-4)
         term = LegacyWindowsTerm()
 
         term.move_cursor_to(coords)
 
         assert not SetConsoleCursorPosition.called
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -208,7 +199,6 @@ def test_move_cursor_up(_, SetConsoleCursorPosition, win32_handle):
             win32_handle, coords=WindowsCoordinates(row=CURSOR_Y - 1, col=CURSOR_X)
         )
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -222,7 +212,6 @@ def test_move_cursor_down(_, SetConsoleCursorPosition, win32_handle):
             win32_handle, coords=WindowsCoordinates(row=CURSOR_Y + 1, col=CURSOR_X)
         )
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -236,16 +225,15 @@ def test_move_cursor_forward(_, SetConsoleCursorPosition, win32_handle):
             win32_handle, coords=WindowsCoordinates(row=CURSOR_Y, col=CURSOR_X + 1)
         )
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
     def test_move_cursor_forward_newline_wrap(SetConsoleCursorPosition, win32_handle):
         cursor_at_end_of_line = StubScreenBufferInfo(
             dwCursorPosition=COORD(SCREEN_WIDTH - 1, CURSOR_Y)
         )
         with patch.object(
-                _win32_console,
-                "GetConsoleScreenBufferInfo",
-                return_value=cursor_at_end_of_line,
+            _win32_console,
+            "GetConsoleScreenBufferInfo",
+            return_value=cursor_at_end_of_line,
         ):
             term = LegacyWindowsTerm()
             term.move_cursor_forward()
@@ -254,7 +242,6 @@ def test_move_cursor_forward_newline_wrap(SetConsoleCursorPosition, win32_handle
             win32_handle, coords=WindowsCoordinates(row=CURSOR_Y + 1, col=0)
         )
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -266,7 +253,6 @@ def test_move_cursor_to_column(_, SetConsoleCursorPosition, win32_handle):
             win32_handle, coords=WindowsCoordinates(CURSOR_Y, 5)
         )
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -278,22 +264,25 @@ def test_move_cursor_backward(_, SetConsoleCursorPosition, win32_handle):
             win32_handle, coords=WindowsCoordinates(row=CURSOR_Y, col=CURSOR_X - 1)
         )
 
-
     @patch.object(_win32_console, "SetConsoleCursorPosition", return_value=None)
-    def test_move_cursor_backward_prev_line_wrap(SetConsoleCursorPosition, win32_handle):
-        cursor_at_start_of_line = StubScreenBufferInfo(dwCursorPosition=COORD(0, CURSOR_Y))
+    def test_move_cursor_backward_prev_line_wrap(
+        SetConsoleCursorPosition, win32_handle
+    ):
+        cursor_at_start_of_line = StubScreenBufferInfo(
+            dwCursorPosition=COORD(0, CURSOR_Y)
+        )
         with patch.object(
-                _win32_console,
-                "GetConsoleScreenBufferInfo",
-                return_value=cursor_at_start_of_line,
+            _win32_console,
+            "GetConsoleScreenBufferInfo",
+            return_value=cursor_at_start_of_line,
         ):
             term = LegacyWindowsTerm()
             term.move_cursor_backward()
         SetConsoleCursorPosition.assert_called_once_with(
-            win32_handle, coords=WindowsCoordinates(row=CURSOR_Y - 1, col=SCREEN_WIDTH - 1)
+            win32_handle,
+            coords=WindowsCoordinates(row=CURSOR_Y - 1, col=SCREEN_WIDTH - 1),
         )
 
-
     @patch.object(_win32_console, "SetConsoleCursorInfo", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -308,7 +297,6 @@ def test_hide_cursor(_, SetConsoleCursorInfo, win32_handle):
         assert call_args[0].kwargs["cursor_info"].bVisible == 0
         assert call_args[0].kwargs["cursor_info"].dwSize == 100
 
-
     @patch.object(_win32_console, "SetConsoleCursorInfo", return_value=None)
     @patch.object(
         _win32_console, "GetConsoleScreenBufferInfo", return_value=StubScreenBufferInfo
@@ -323,15 +311,13 @@ def test_show_cursor(_, SetConsoleCursorInfo, win32_handle):
         assert call_args[0].kwargs["cursor_info"].bVisible == 1
         assert call_args[0].kwargs["cursor_info"].dwSize == 100
 
-
     @patch.object(_win32_console, "SetConsoleTitle", return_value=None)
     def test_set_title(SetConsoleTitle):
         term = LegacyWindowsTerm()
         term.set_title("title")
 
         SetConsoleTitle.assert_called_once_with("title")
 
-
     @patch.object(_win32_console, "SetConsoleTitle", return_value=None)
     def test_set_title_too_long(_):
         term = LegacyWindowsTerm()