[3.13] gh-118877: Fix AssertionError crash in pyrepl (GH-118936) (#119363)

(cherry picked from commit c0d81b2566)

Co-authored-by: Daniel Hollas <daniel.hollas@bristol.ac.uk>
This commit is contained in:
Miss Islington (bot) 2024-05-22 03:28:24 +02:00 committed by GitHub
parent f15fbe9991
commit e992217810
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 4 deletions

View file

@ -34,9 +34,7 @@ import os
# types
if False:
from .reader import Reader
from .historical_reader import HistoricalReader
from .console import Event
class Command:
@ -245,7 +243,7 @@ class up(MotionCommand):
x, y = r.pos2xy()
new_y = y - 1
if new_y < 0:
if r.bol() == 0:
if r.historyi > 0:
r.select_item(r.historyi - 1)
return

View file

@ -607,6 +607,30 @@ class TestPyReplCompleter(TestCase):
output = multiline_input(reader, namespace)
self.assertEqual(output, "python")
def test_updown_arrow_with_completion_menu(self):
"""Up arrow in the middle of unfinished tab completion when the menu is displayed
should work and trigger going back in history. Down arrow should subsequently
get us back to the incomplete command."""
code = "import os\nos.\t\t"
namespace = {"os": os}
events = itertools.chain(
code_to_events(code),
[
Event(evt='key', data='up', raw=bytearray(b'\x1bOA')),
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
],
code_to_events("\n")
)
reader = self.prepare_reader(events, namespace=namespace)
output = multiline_input(reader, namespace)
# This is the first line, nothing to see here
self.assertEqual(output, "import os")
# This is the second line. We pressed up and down arrows
# so we should end up where we were when we initiated tab completion.
output = multiline_input(reader, namespace)
self.assertEqual(output, "os.")
@patch("_pyrepl.curses.tigetstr", lambda x: b"")
class TestUnivEventQueue(TestCase):
@ -1001,6 +1025,5 @@ class TestReader(TestCase):
reader, _ = handle_all_events(events)
self.assert_screen_equals(reader, "")
if __name__ == '__main__':
unittest.main()