Skip to content

GH-132439: Fix REPL swallowing characters entered with AltGr on cmd.exe #132440

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
ambv merged 13 commits into from
May 5, 2025
Merged

GH-132439: Fix REPL swallowing characters entered with AltGr on cmd.exe #132440

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
59d71b0
do not swallow characters that have been entered via AltGr
chris-eibl Apr 12, 2025
cca6155
blurb it
chris-eibl Apr 12, 2025
1e61540
unrelated stuff worth to do (?)
chris-eibl Apr 12, 2025
c60a727
Merge remote-tracking branch 'origin/main' into fix_altgr
chris-eibl Apr 19, 2025
ed035e5
fix missing con.restore() in test_multiline_ctrl_z
chris-eibl Apr 20, 2025
69e8779
add WindowsConsoleGetEventTests
chris-eibl Apr 20, 2025
8ee232c
Merge branch 'main' into fix_altgr
chris-eibl Apr 20, 2025
e67452b
Apply suggestions from code review
chris-eibl Apr 25, 2025
396f48e
Update Lib/test/test_pyrepl/test_windows_console.py
chris-eibl Apr 25, 2025
40b339a
Merge branch 'main' into fix_altgr
chris-eibl May 4, 2025
1fbe240
revert change in virtual terminal path
chris-eibl May 4, 2025
2d59563
Merge remote-tracking branch 'origin/main' into fix_altgr
chris-eibl May 5, 2025
adb89ba
remove raw part of Event in get_event() in case of windows_console
chris-eibl May 5, 2025
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
Prev Previous commit
remove raw part of Event in get_event() in case of windows_console 
because it is unused
  • Loading branch information
@chris-eibl
chris-eibl committed May 5, 2025
commit adb89bab0c4be9355988b4615f75660fc9db0094
10 changes: 5 additions & 5 deletions Lib/_pyrepl/windows_console.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ def get_event(self, block: bool = True) -> Event | None:

if key == "\r":
# Make enter unix-like
return Event(evt="key", data="\n", raw=b"\n")
return Event(evt="key", data="\n")
elif key_event.wVirtualKeyCode == 8:
# Turn backspace directly into the command
key = "backspace"
Expand All @@ -476,9 +476,9 @@ def get_event(self, block: bool = True) -> Event | None:
key = f"ctrl {key}"
elif key_event.dwControlKeyState & ALT_ACTIVE:
# queue the key, return the meta command
self.event_queue.insert(Event(evt="key", data=key, raw=raw_key))
self.event_queue.insert(Event(evt="key", data=key))
return Event(evt="key", data="\033") # keymap.py uses this for meta
return Event(evt="key", data=key, raw=raw_key)
return Event(evt="key", data=key)
if block:
continue

Expand All @@ -494,10 +494,10 @@ def get_event(self, block: bool = True) -> Event | None:
# https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-vkkeyscanw
if not key_event.dwControlKeyState & CTRL_ACTIVE:
Comment thread
ambv marked this conversation as resolved.
# queue the key, return the meta command
self.event_queue.insert(Event(evt="key", data=key, raw=raw_key))
self.event_queue.insert(Event(evt="key", data=key))
return Event(evt="key", data="\033") # keymap.py uses this for meta

return Event(evt="key", data=key, raw=raw_key)
return Event(evt="key", data=key)
return self.event_queue.get()

def push_char(self, char: int | bytes) -> None:
Expand Down
30 changes: 15 additions & 15 deletions Lib/test/test_pyrepl/test_windows_console.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,51 +432,51 @@ def test_unhandled_events(self):

def test_enter(self):
ir = self.get_input_record("\r", self.VK_RETURN)
self.assertEqual(self.get_event([ir]), Event("key", "\n", b"\n"))
self.assertEqual(self.get_event([ir]), Event("key", "\n"))
self.assertEqual(self.mock.call_count, 1)

def test_backspace(self):
ir = self.get_input_record("\x08", self.VK_BACK)
self.assertEqual(
self.get_event([ir]), Event("key", "backspace", "\x08"))
self.get_event([ir]), Event("key", "backspace"))
self.assertEqual(self.mock.call_count, 1)

def test_m(self):
ir = self.get_input_record("m", self.VK_M)
self.assertEqual(self.get_event([ir]), Event("key", "m", "m"))
self.assertEqual(self.get_event([ir]), Event("key", "m"))
self.assertEqual(self.mock.call_count, 1)

def test_M(self):
ir = self.get_input_record("M", self.VK_M, self.SHIFT_PRESSED)
self.assertEqual(self.get_event([ir]), Event("key", "M", "M"))
self.assertEqual(self.get_event([ir]), Event("key", "M"))
self.assertEqual(self.mock.call_count, 1)

def test_left(self):
# VK_LEFT is sent as ENHANCED_KEY
ir = self.get_input_record("\x00", self.VK_LEFT, self.ENHANCED_KEY)
self.assertEqual(self.get_event([ir]), Event("key", "left", "\x00"))
self.assertEqual(self.get_event([ir]), Event("key", "left"))
self.assertEqual(self.mock.call_count, 1)

def test_left_RIGHT_CTRL_PRESSED(self):
ir = self.get_input_record(
"\x00", self.VK_LEFT, self.RIGHT_CTRL_PRESSED | self.ENHANCED_KEY)
self.assertEqual(
self.get_event([ir]), Event("key", "ctrl left", "\x00"))
self.get_event([ir]), Event("key", "ctrl left"))
self.assertEqual(self.mock.call_count, 1)

def test_left_LEFT_CTRL_PRESSED(self):
ir = self.get_input_record(
"\x00", self.VK_LEFT, self.LEFT_CTRL_PRESSED | self.ENHANCED_KEY)
self.assertEqual(
self.get_event([ir]), Event("key", "ctrl left", "\x00"))
self.get_event([ir]), Event("key", "ctrl left"))
self.assertEqual(self.mock.call_count, 1)

def test_left_RIGHT_ALT_PRESSED(self):
ir = self.get_input_record(
"\x00", self.VK_LEFT, self.RIGHT_ALT_PRESSED | self.ENHANCED_KEY)
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
self.assertEqual(
self.console.get_event(), Event("key", "left", "\x00"))
self.console.get_event(), Event("key", "left"))
# self.mock is not called again, since the second time we read from the
# command queue
self.assertEqual(self.mock.call_count, 1)
Expand All @@ -486,7 +486,7 @@ def test_left_LEFT_ALT_PRESSED(self):
"\x00", self.VK_LEFT, self.LEFT_ALT_PRESSED | self.ENHANCED_KEY)
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
self.assertEqual(
self.console.get_event(), Event("key", "left", "\x00"))
self.console.get_event(), Event("key", "left"))
self.assertEqual(self.mock.call_count, 1)

def test_m_LEFT_ALT_PRESSED_and_LEFT_CTRL_PRESSED(self):
Expand All @@ -505,14 +505,14 @@ def test_m_LEFT_ALT_PRESSED(self):
ir = self.get_input_record(
"m", vcode=self.VK_M, control=self.LEFT_ALT_PRESSED)
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
self.assertEqual(self.console.get_event(), Event("key", "m", "m"))
self.assertEqual(self.console.get_event(), Event("key", "m"))
self.assertEqual(self.mock.call_count, 1)

def test_m_RIGHT_ALT_PRESSED(self):
ir = self.get_input_record(
"m", vcode=self.VK_M, control=self.RIGHT_ALT_PRESSED)
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
self.assertEqual(self.console.get_event(), Event("key", "m", "m"))
self.assertEqual(self.console.get_event(), Event("key", "m"))
self.assertEqual(self.mock.call_count, 1)

def test_AltGr_7(self):
Expand All @@ -528,7 +528,7 @@ def test_AltGr_7(self):
ir = self.get_input_record(
"{", vcode=self.VK_7,
control=self.RIGHT_ALT_PRESSED | self.LEFT_CTRL_PRESSED)
self.assertEqual(self.get_event([ir]), Event("key", "{", "{"))
self.assertEqual(self.get_event([ir]), Event("key", "{"))
self.assertEqual(self.mock.call_count, 1)

def test_AltGr_m(self):
Expand All @@ -537,12 +537,12 @@ def test_AltGr_m(self):
# time, to cover that, too. See above in test_AltGr_7.
ir = self.get_input_record(
"µ", vcode=self.VK_M, control=self.LEFT_ALT_PRESSED | self.RIGHT_CTRL_PRESSED)
self.assertEqual(self.get_event([ir]), Event("key", "µ", "µ"))
self.assertEqual(self.get_event([ir]), Event("key", "µ"))
self.assertEqual(self.mock.call_count, 1)

def test_umlaut_a_german(self):
ir = self.get_input_record("ä", self.VK_OEM_7)
self.assertEqual(self.get_event([ir]), Event("key", "ä", "ä"))
self.assertEqual(self.get_event([ir]), Event("key", "ä"))
self.assertEqual(self.mock.call_count, 1)

# virtual terminal tests
Expand All @@ -557,7 +557,7 @@ def test_umlaut_a_german(self):
def test_enter_vt(self):
ir = self.get_input_record("\r")
self.assertEqual(self.get_event([ir], vt_support=True),
Event("key", "\n", b"\n"))
Event("key", "\n"))
self.assertEqual(self.mock.call_count, 1)

def test_backspace_vt(self):
Expand Down