Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-131878: Fix input of unicode characters with two or more code points in new pyrepl on Windows#131901

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.

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

Already on GitHub?Sign in to your account

Merged
Show file tree
Hide file tree
Changes from5 commits
Commits
Show all changes
13 commits
Select commitHold shift + click to select a range
04812d4
Fix input of long unicode characters
sergey-miryanovMar 30, 2025
9203df4
Add new entry
sergey-miryanovMar 30, 2025
9d7e3e5
Do not change simple_interact
sergey-miryanovMar 30, 2025
7fd3418
Do not use bytearray to convert char to bytes
sergey-miryanovApr 26, 2025
a2fb7ee
Merge branch 'main' into gh-131878-fix-unicode-input-in-new-pyrepl-fo…
sergey-miryanovApr 26, 2025
b1fa88d
Push char one by one in windows_console
sergey-miryanovApr 27, 2025
925f3a2
Apply Chris Eibl suggestionы and use only int and bytes in eventqueue…
sergey-miryanovApr 27, 2025
aa56581
Do not use finally to reset keymap
sergey-miryanovApr 27, 2025
1eaeca3
Rename tests along Chris Eibl suggestions
sergey-miryanovApr 27, 2025
68d978e
Fix tests
sergey-miryanovApr 28, 2025
7f8fb7f
Add comment
sergey-miryanovApr 28, 2025
9519208
Update comments in the test
sergey-miryanovApr 29, 2025
a855ba8
Use to_bytes
sergey-miryanovMay 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
23 changes: 15 additions & 8 deletionsLib/_pyrepl/base_eventqueue.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,14 +73,19 @@ 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)
if ord_char > 255:
assert isinstance(char, str)
char = bytes(char.encode(self.encoding, "replace"))

if isinstance(char, bytes):
self.buf.extend(char)
else:
char = bytes(bytearray((ord_char,)))
self.buf.append(ord_char)

ord_char = char if isinstance(char, int) else ord(char)
if ord_char > 255:
assert isinstance(char, str)
char = bytes(char.encode(self.encoding, "replace"))
self.buf.extend(char)
else:
char = bytes([ord_char])
self.buf.append(ord_char)

if char in self.keymap:
if self.keymap is self.compiled_keymap:
Expand DownExpand Up@@ -108,7 +113,9 @@ def push(self, char: int | bytes | str) -> None:
try:
decoded = bytes(self.buf).decode(self.encoding)
except UnicodeError:
return
self.flush_buf()
raise
else:
self.insert(Event('key', decoded, self.flush_buf()))
self.keymap = self.compiled_keymap
finally:
self.keymap = self.compiled_keymap
3 changes: 2 additions & 1 deletionLib/_pyrepl/windows_console.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,7 +468,8 @@ def get_event(self, block: bool = True) -> Event | None:
return None
elif self.__vt_support:
# If virtual terminal is enabled, scanning VT sequences
self.event_queue.push(rec.Event.KeyEvent.uChar.UnicodeChar)
key_bytes = raw_key.encode(self.event_queue.encoding)
self.event_queue.push(key_bytes)
continue

if key_event.dwControlKeyState & ALT_ACTIVE:
Expand Down
71 changes: 71 additions & 0 deletionsLib/test/test_pyrepl/test_eventqueue.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,77 @@ def test_push_unicode_character(self):
self.assertEqual(eq.events[0].evt, "key")
self.assertEqual(eq.events[0].data, "ч")

def test_push_unicode_character_as_bytes(self):
eq = self.make_eventqueue()
eq.keymap = {}

eq.push("ч".encode(eq.encoding, "replace"))
e = eq.get()
self.assertEqual(e.evt, "key")
self.assertEqual(e.data, "ч")

def test_push_long_unicode_character_as_bytes(self):
eq = self.make_eventqueue()
eq.keymap = {}

def _event(evt, data, raw=None):
r = raw if raw is not None else data.encode(eq.encoding)
e = Event(evt, data, r)
return e

def _push(keys):
for k in keys:
eq.push(k)

_push("\x1b[200")
eq.push("ñ".encode(eq.encoding, "replace"))
_push("\x1b[201")

self.assertEqual(eq.get(), _event("key", "\x1b"))
self.assertEqual(eq.get(), _event("key", "["))
self.assertEqual(eq.get(), _event("key", "2"))
self.assertEqual(eq.get(), _event("key", "0"))
self.assertEqual(eq.get(), _event("key", "0"))

self.assertEqual(eq.get(), _event("key", "ñ", b'\xc3\xb1'))

self.assertEqual(eq.get(), _event("key", "\x1b"))
self.assertEqual(eq.get(), _event("key", "["))
self.assertEqual(eq.get(), _event("key", "2"))
self.assertEqual(eq.get(), _event("key", "0"))
self.assertEqual(eq.get(), _event("key", "1"))

def test_push_long_unicode_character(self):
eq = self.make_eventqueue()
eq.keymap = {}

def _event(evt, data, raw=None):
r = raw if raw is not None else data.encode(eq.encoding)
e = Event(evt, data, r)
return e

def _push(keys):
for k in keys:
eq.push(k)

_push("\x1b[200")
msg = "'utf-8' codec can't decode byte 0xf1 in position 0: unexpected end of data"
with self.assertRaisesRegex(UnicodeDecodeError, msg):
eq.push("ñ")
_push("\x1b[201")

self.assertEqual(eq.get(), _event("key", "\x1b"))
self.assertEqual(eq.get(), _event("key", "["))
self.assertEqual(eq.get(), _event("key", "2"))
self.assertEqual(eq.get(), _event("key", "0"))
self.assertEqual(eq.get(), _event("key", "0"))

self.assertEqual(eq.get(), _event("key", "\x1b"))
self.assertEqual(eq.get(), _event("key", "["))
self.assertEqual(eq.get(), _event("key", "2"))
self.assertEqual(eq.get(), _event("key", "0"))
self.assertEqual(eq.get(), _event("key", "1"))


@unittest.skipIf(support.MS_WINDOWS, "No Unix event queue on Windows")
class TestUnixEventQueue(EventQueueTestBase, unittest.TestCase):
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
Fix support of unicode characters with two or more codepoints on Windows in
the new REPL.
Loading
[8]ページ先頭
©2009-2025 Movatter.jp