Skip to content

[3.13] gh-124628: Pyrepl inputs on Windows shouldn't always be blocking reads (GH-124629) #124638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2024
+21 −9
Merged

[3.13] gh-124628: Pyrepl inputs on Windows shouldn't always be blocking reads (GH-124629) #124638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions Lib/_pyrepl/windows_console.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,15 +371,19 @@ def _getscrollbacksize(self) -> int:

return info.srWindow.Bottom # type: ignore[no-any-return]

def _read_input(self) -> INPUT_RECORD | None:
def _read_input(self, block: bool = True) -> INPUT_RECORD | None:
if not block:
events = DWORD()
if not GetNumberOfConsoleInputEvents(InHandle, events):
raise WinError(GetLastError())
if not events.value:
return None

rec = INPUT_RECORD()
read = DWORD()
if not ReadConsoleInput(InHandle, rec, 1, read):
raise WinError(GetLastError())

if read.value == 0:
return None

return rec

def get_event(self, block: bool = True) -> Event | None:
Expand All @@ -390,10 +394,8 @@ def get_event(self, block: bool = True) -> Event | None:
return self.event_queue.pop()

while True:
rec = self._read_input()
rec = self._read_input(block)
if rec is None:
if block:
continue
return None

if rec.EventType == WINDOW_BUFFER_SIZE_EVENT:
Expand Down Expand Up @@ -464,8 +466,8 @@ def flushoutput(self) -> None:

def forgetinput(self) -> None:
"""Forget all pending, but not yet processed input."""
while self._read_input() is not None:
pass
if not FlushConsoleInputBuffer(InHandle):
raise WinError(GetLastError())

def getpending(self) -> Event:
"""Return the characters that have been typed but not yet
Expand Down Expand Up @@ -590,6 +592,14 @@ class INPUT_RECORD(Structure):
ReadConsoleInput.argtypes = [HANDLE, POINTER(INPUT_RECORD), DWORD, POINTER(DWORD)]
ReadConsoleInput.restype = BOOL

GetNumberOfConsoleInputEvents = _KERNEL32.GetNumberOfConsoleInputEvents
GetNumberOfConsoleInputEvents.argtypes = [HANDLE, POINTER(DWORD)]
GetNumberOfConsoleInputEvents.restype = BOOL

FlushConsoleInputBuffer = _KERNEL32.FlushConsoleInputBuffer
FlushConsoleInputBuffer.argtypes = [HANDLE]
FlushConsoleInputBuffer.restype = BOOL

OutHandle = GetStdHandle(STD_OUTPUT_HANDLE)
InHandle = GetStdHandle(STD_INPUT_HANDLE)
else:
Expand All @@ -602,5 +612,7 @@ def _win_only(*args, **kwargs):
ScrollConsoleScreenBuffer = _win_only
SetConsoleMode = _win_only
ReadConsoleInput = _win_only
GetNumberOfConsoleInputEvents = _win_only
FlushConsoleInputBuffer = _win_only
OutHandle = 0
InHandle = 0
Loading