Skip to content

gh-150582: Use _winapi for _pyrepl console handles and waits #150584

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

Open
aisk wants to merge 8 commits into
base: main
Choose a base branch
from
+12 −23
Open

gh-150582: Use _winapi for _pyrepl console handles and waits #150584

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d77c46e
Use _winapi for _pyrepl console handles and waits
aisk May 29, 2026
8d3ef98
Use _winapi calls directly in _pyrepl
aisk May 29, 2026
4dfefb8
Move _winapi import with other imports
aisk May 29, 2026
3ff96ae
Fix mypy for _winapi usage in _pyrepl
aisk May 29, 2026
24331a9
Remove redundant type: ignore for _winapi.WaitForSingleObject
aisk May 30, 2026
f55b7a5
Fix mypy
aisk May 30, 2026
cf13fbd
Reduce codes
aisk May 30, 2026
3c8917f
Use STD handle consts from _winapi
aisk May 30, 2026
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
35 changes: 12 additions & 23 deletions Lib/_pyrepl/windows_console.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
from .windows_eventqueue import EventQueue

try:
from ctypes import get_last_error, WinDLL, windll, WinError # type: ignore[attr-defined]
from ctypes import get_last_error, WinDLL, WinError # type: ignore[attr-defined]
except:
# Keep MyPy happy off Windows
from ctypes import CDLL as WinDLL, cdll as windll
from ctypes import CDLL as WinDLL

def get_last_error() -> int:
return 42
Expand All @@ -66,11 +66,14 @@ def __init__(self, err: int | None, descr: str | None = None) -> None:
self.err = err
self.descr = descr

# declare nt optional to allow None assignment on other platforms
# declare optional to allow None assignment on other platforms
_winapi: types.ModuleType | None
nt: types.ModuleType | None
try:
import _winapi
import nt
except ImportError:
_winapi = None
nt = None

if TYPE_CHECKING:
Expand Down Expand Up @@ -122,7 +125,6 @@ def __init__(self, err: int | None, descr: str | None = None) -> None:
CTRL_ACTIVE = 0x04 | 0x08

WAIT_TIMEOUT = 0x102
WAIT_FAILED = 0xFFFFFFFF

# from winbase.h
INFINITE = 0xFFFFFFFF
Expand Down Expand Up @@ -696,10 +698,9 @@ def wait_for_event(self, timeout: float | None) -> bool:
timeout = INFINITE
else:
timeout = int(timeout)
ret = WaitForSingleObject(InHandle, timeout)
if ret == WAIT_FAILED:
raise WinError(get_last_error())
elif ret == WAIT_TIMEOUT:
assert _winapi is not None # to make mypy happy
ret = _winapi.WaitForSingleObject(InHandle, timeout)
if ret == WAIT_TIMEOUT:
return False
return True

Expand Down Expand Up @@ -792,16 +793,10 @@ class INPUT_RECORD(Structure):
ENABLE_WRAP_AT_EOL_OUTPUT = 0x02
ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x04

STD_INPUT_HANDLE = -10
STD_OUTPUT_HANDLE = -11

if sys.platform == "win32":
assert _winapi is not None # to make mypy happy
_KERNEL32 = WinDLL("kernel32", use_last_error=True)

GetStdHandle = windll.kernel32.GetStdHandle
GetStdHandle.argtypes = [DWORD]
GetStdHandle.restype = HANDLE

GetConsoleScreenBufferInfo = _KERNEL32.GetConsoleScreenBufferInfo
GetConsoleScreenBufferInfo.argtypes = [
HANDLE,
Expand Down Expand Up @@ -836,24 +831,18 @@ class INPUT_RECORD(Structure):
FlushConsoleInputBuffer.argtypes = [HANDLE]
FlushConsoleInputBuffer.restype = BOOL

WaitForSingleObject = _KERNEL32.WaitForSingleObject
WaitForSingleObject.argtypes = [HANDLE, DWORD]
WaitForSingleObject.restype = DWORD

OutHandle = GetStdHandle(STD_OUTPUT_HANDLE)
InHandle = GetStdHandle(STD_INPUT_HANDLE)
OutHandle = _winapi.GetStdHandle(_winapi.STD_OUTPUT_HANDLE)
InHandle = _winapi.GetStdHandle(_winapi.STD_INPUT_HANDLE)
else:

def _win_only(*args, **kwargs):
raise NotImplementedError("Windows only")

GetStdHandle = _win_only
GetConsoleScreenBufferInfo = _win_only
ScrollConsoleScreenBuffer = _win_only
GetConsoleMode = _win_only
SetConsoleMode = _win_only
ReadConsoleInput = _win_only
FlushConsoleInputBuffer = _win_only
WaitForSingleObject = _win_only
OutHandle = 0
InHandle = 0
Loading