https://github.com/python/cpython/commit/2468c35c3b3375fe0745fa5b5429d47098ebb45e
commit: 2468c35c3b3375fe0745fa5b5429d47098ebb45e
branch: main
author: An Long <[email protected]>
committer: chris-eibl <[email protected]>
date: 2026-10-25T10:11:43Z
summary:
gh-150582: Use _winapi for _pyrepl console handles and waits (#150584)
files:
M Lib/_pyrepl/windows_console.py
diff --git a/Lib/_pyrepl/windows_console.py b/Lib/_pyrepl/windows_console.py
index 65eacf90fde685..51079e27a77a55 100644
--- a/Lib/_pyrepl/windows_console.py
+++ b/Lib/_pyrepl/windows_console.py
@@ -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
@@ -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
lazy from typing import IO
@@ -121,7 +124,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
@@ -697,10 +699,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
@@ -793,16 +794,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,
@@ -837,24 +832,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
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
