Resolved comments

Author: hyongtao-code

Lib/_pyrepl/windows_console.py

@@ -247,14 +247,9 @@ def input_hook(self):
         if nt is not None and nt._is_inputhook_installed():
             return nt._inputhook
 
-    def _has_wrapped_to_next_row(self, y: int) -> bool | None:
+    def _has_wrapped_to_next_row(self, y: int) -> bool:
         """
-        Return whether the real console cursor wrapped to the next row.
-
-        Returns:
-            True  - cursor wrapped to the next visible row
-            False - cursor did not wrap
-            None  - cannot query the real cursor position (e.g. invalid handle)
+        Return True if the real console cursor wrapped to the next visible row.
         """
         info = CONSOLE_SCREEN_BUFFER_INFO()
         if not GetConsoleScreenBufferInfo(OutHandle, info):

Lib/test/test_pyrepl/test_pyrepl.py

@@ -2205,28 +2205,3 @@ def fake_gcsbi(_h, info):
         with patch.object(wc, "GetConsoleScreenBufferInfo", side_effect=fake_gcsbi), \
              patch.object(wc, "OutHandle", 1):
             self.assertIs(con._has_wrapped_to_next_row(y), False)
-
-    def test_returns_none_on_invalid_handle(self):
-        con, wc = self._make_console_like(offset=0)
-        y = 3
-
-        def fake_gcsbi(_h, info):
-            return False
-
-        with patch.object(wc, "GetConsoleScreenBufferInfo", side_effect=fake_gcsbi), \
-             patch.object(wc, "OutHandle", 1), \
-             patch.object(wc, "get_last_error", return_value=6):  # ERROR_INVALID_HANDLE
-            self.assertIs(con._has_wrapped_to_next_row(y), None)
-
-    def test_raises_on_unexpected_error(self):
-        con, wc = self._make_console_like(offset=0)
-        y = 3
-
-        def fake_gcsbi(_h, info):
-            return False
-
-        with patch.object(wc, "GetConsoleScreenBufferInfo", side_effect=fake_gcsbi), \
-             patch.object(wc, "OutHandle", 1), \
-             patch.object(wc, "get_last_error", return_value=5):  # ERROR_ACCESS_DENIED
-            with self.assertRaises(OSError):
-                con._has_wrapped_to_next_row(y)

Lib/test/test_pyrepl/test_windows_console.py

@@ -41,6 +41,7 @@ def console(self, events, **kwargs) -> Console:
         console._hide_cursor = MagicMock()
         console._show_cursor = MagicMock()
         console._getscrollbacksize = MagicMock(42)
+        console._has_wrapped_to_next_row = MagicMock(return_value=False)
         console.out = MagicMock()
 
         height = kwargs.get("height", 25)