mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

gh-127349: Add check for correct resizing in REPL (#127387)

Browse source
This commit is contained in:
donBarbos 2025-01-30 19:34:09 +00:00 • committed by GitHub
parent 4ca9fc08f8
commit 510fefdc62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/_pyrepl/reader.py
View file

@ -587,10 +587,11 @@ class Reader:
def pos2xy(self) -> tuple[int, int]: def pos2xy(self) -> tuple[int, int]:
"""Return the x, y coordinates of position 'pos'.""" """Return the x, y coordinates of position 'pos'."""
# this *is* incomprehensible, yes. # this *is* incomprehensible, yes.
y = 0 p, y = 0, 0
l2: list[int] = []
pos = self.pos pos = self.pos
assert 0 <= pos <= len(self.buffer) assert 0 <= pos <= len(self.buffer)
if pos == len(self.buffer): if pos == len(self.buffer) and len(self.screeninfo) > 0:
y = len(self.screeninfo) - 1 y = len(self.screeninfo) - 1
p, l2 = self.screeninfo[y] p, l2 = self.screeninfo[y]
return p + sum(l2) + l2.count(0), y return p + sum(l2) + l2.count(0), y

9
Lib/test/test_pyrepl/test_reader.py
View file

@ -4,7 +4,7 @@ import rlcompleter
from unittest import TestCase from unittest import TestCase
from unittest.mock import MagicMock from unittest.mock import MagicMock
from .support import handle_all_events, handle_events_narrow_console, code_to_events, prepare_reader from .support import handle_all_events, handle_events_narrow_console, code_to_events, prepare_reader, prepare_console
from _pyrepl.console import Event from _pyrepl.console import Event
from _pyrepl.reader import Reader from _pyrepl.reader import Reader
@ -312,3 +312,10 @@ class TestReader(TestCase):
reader, _ = handle_all_events(events, prepare_reader=completing_reader) reader, _ = handle_all_events(events, prepare_reader=completing_reader)
self.assert_screen_equals(reader, f"{code}a") self.assert_screen_equals(reader, f"{code}a")
def test_pos2xy_with_no_columns(self):
console = prepare_console([])
reader = prepare_reader(console)
# Simulate a resize to 0 columns
reader.screeninfo = []
self.assertEqual(reader.pos2xy(), (0, 0))

2
Misc/NEWS.d/next/Core_and_Builtins/2024-11-30-16-13-31.gh-issue-127349.ssYd6n.rst Normal file
View file

@ -0,0 +1,2 @@
Fixed the error when resizing terminal in Python REPL. Patch by Semyon
Moroz.