Skip to content

gh-130804: Fix support of typing unicode chars in pyrepl #130805

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 7 commits into from
Mar 10, 2025
Merged

gh-130804: Fix support of typing unicode chars in pyrepl #130805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3d674cf
Fix support of typing unicode chars in pyrepl
sergey-miryanov Mar 3, 2025
c1f3aa8
Make mypy happy
sergey-miryanov Mar 3, 2025
ef0d0ee
Add assert to check if passed char is str
sergey-miryanov Mar 3, 2025
497a0bb
Merge branch 'main' into gh-130804-pyrepl-unicode-chars
sergey-miryanov Mar 4, 2025
bfa2e4e
Update Lib/_pyrepl/base_eventqueue.py
sergey-miryanov Mar 10, 2025
c667049
Merge branch 'main' into gh-130804-pyrepl-unicode-chars
sergey-miryanov Mar 10, 2025
7cc16ea
Add NEWS entry
pablogsal Mar 10, 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
12 changes: 9 additions & 3 deletions Lib/_pyrepl/base_eventqueue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,19 @@ def insert(self, event: Event) -> None:
trace('added event {event}', event=event)
self.events.append(event)

def push(self, char: int | bytes) -> None:
def push(self, char: int | bytes | str) -> None:
"""
Processes a character by updating the buffer and handling special key mappings.
"""
ord_char = char if isinstance(char, int) else ord(char)
char = bytes(bytearray((ord_char,)))
self.buf.append(ord_char)
if ord_char > 255:
assert isinstance(char, str)
char = bytes(char.encode(self.encoding, "replace"))
self.buf.extend(char)
else:
char = bytes(bytearray((ord_char,)))
self.buf.append(ord_char)

if char in self.keymap:
if self.keymap is self.compiled_keymap:
# sanity check, buffer is empty when a special key comes
Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_pyrepl/test_eventqueue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,13 @@ def test_push_unrecognized_escape_sequence(self):
self.assertEqual(eq.events[2].evt, "key")
self.assertEqual(eq.events[2].data, "Z")

def test_push_unicode_character(self):
eq = self.make_eventqueue()
eq.keymap = {}
eq.push("ч")
self.assertEqual(eq.events[0].evt, "key")
self.assertEqual(eq.events[0].data, "ч")


@unittest.skipIf(support.MS_WINDOWS, "No Unix event queue on Windows")
class TestUnixEventQueue(EventQueueTestBase, unittest.TestCase):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-03-10-21-46-37.gh-issue-130804.0PpcTx.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix support of unicode characters on Windows in the new REPL.
Loading