Skip to content

gh-140502: fix default REPL does not handle tab right #140697

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+24 −2
Open

gh-140502: fix default REPL does not handle tab right #140697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5114550
fix: default REPL does not handle tab right
yihong0618 Oct 28, 2025
39db06d
fix: delete extra line in import
yihong0618 Oct 28, 2025
feaa1db
Update Lib/_pyrepl/utils.py
yihong0618 Oct 29, 2025
357cb9b
fix: apply comments
yihong0618 Oct 29, 2025
98baaee
Merge branch 'main' into close_issue_140502
sergey-miryanov Oct 29, 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
8 changes: 6 additions & 2 deletions Lib/_pyrepl/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,12 @@ def disp_str(
for i, c in enumerate(buffer, start_index):
if colors and colors[0].span.start == i: # new color starts now
pre_color = theme[colors[0].tag]

if c == "\x1a": # CTRL-Z on Windows
# gh-140502: properly handle tabs when pasting multiline text
if c == "\t":
width = 8 - (sum(char_widths) % 8)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be better to use a constant here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the code below not use constant, so its fine here

chars.append(" " * width)
char_widths.append(width)
elif c == "\x1a": # CTRL-Z on Windows
chars.append(c)
char_widths.append(2)
elif ord(c) < 128:
Expand Down
17 changes: 17 additions & 0 deletions Lib/test/test_pyrepl/test_pyrepl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
ReadlineConfig,
_ReadlineWrapper,
)
from _pyrepl.utils import disp_str
from _pyrepl.readline import multiline_input as readline_multiline_input

try:
Expand Down Expand Up @@ -1911,3 +1912,19 @@ def test_ctrl_d_single_line_end_no_newline(self):
)
reader, _ = handle_all_events(events)
self.assertEqual("hello", "".join(reader.buffer))


class TestDispStr(TestCase):
def test_disp_str_width_calculation(self):
test_cases = [
("\tX", [8, 1]), # column 0 -> 8 spaces
("X\t", [1, 7]), # column 1 -> 7 spaces
("ABC\tX", [1, 1, 1, 5, 1]), # column 3 -> 5 spaces
("XXXXXXX\t", [1, 1, 1, 1, 1, 1, 1, 1]), # column 7 -> 1 space
("XXXXXXXX\t", [1, 1, 1, 1, 1, 1, 1, 1, 8]), # column 8 -> 8 spaces
("中\tX", [2, 6, 1]), # wide char + tab
]
for buffer, expected_widths in test_cases:
with self.subTest(buffer=repr(buffer)):
_, widths = disp_str(buffer, 0)
self.assertEqual(widths, expected_widths)
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2025-10-28-17-15-30.gh-issue-140502.ilUv1f.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix: default REPL ``disp_str`` does not handle tab right.
Loading