Skip to content

gh-144259: Fix Windows EOL wrap by syncing real console cursor #144297

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

Closed
hyongtao-code wants to merge 14 commits into from
+111 −4
Closed

gh-144259: Fix Windows EOL wrap by syncing real console cursor #144297

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cfc3423
Fix Windows VT EOL wrap by syncing real console cursor
hyongtao-code Jan 28, 2026
0acecdc
Add test case
hyongtao-code Jan 28, 2026
a2d1786
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 28, 2026
e085733
Post fix based on lint
hyongtao-code Jan 28, 2026
22a8e9e
Update Lib/_pyrepl/windows_console.py
hyongtao-code Feb 1, 2026
e13d1dd
Add test case
hyongtao-code Feb 1, 2026
460dfb3
Update NEWs
hyongtao-code Feb 1, 2026
f66910e
Fix CI failed
hyongtao-code Feb 1, 2026
4647e00
Resolve comments
hyongtao-code Feb 1, 2026
fb63940
Update Lib/_pyrepl/windows_console.py
hyongtao-code Feb 1, 2026
4a84421
Update Lib/_pyrepl/windows_console.py
hyongtao-code Feb 1, 2026
b2b78a8
Resolved comments
hyongtao-code Feb 2, 2026
9a168a9
Update comments
hyongtao-code Feb 2, 2026
a3b292b
Resolve comments
hyongtao-code Feb 4, 2026
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
Prev Previous commit
Resolve comments
  • Loading branch information
@hyongtao-code
hyongtao-code committed Feb 4, 2026
commit a3b292be27b47b87b8314434b189f15384d9855b
24 changes: 11 additions & 13 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 @@ -2115,7 +2115,7 @@ class TestWindowsConsoleEolWrap(TestCase):
We use _has_wrapped_to_next_row() to determine the actual behavior.
"""

def _make_console_like(self, *, width: int, offset: int, vt: bool):
def _make_console_like(self, *, width: int, vt: bool):
from _pyrepl import windows_console as wc

con = object.__new__(wc.WindowsConsole)
Expand All @@ -2124,7 +2124,7 @@ def _make_console_like(self, *, width: int, offset: int, vt: bool):
con.width = width
con.screen = []
con.posxy = (0, 0)
setattr(con, "_WindowsConsole__offset", offset)
setattr(con, "_WindowsConsole__offset", 0)
setattr(con, "_WindowsConsole__vt_support", vt)

# Stub out side-effecting methods used by __write_changed_line()
Expand All @@ -2139,7 +2139,7 @@ def _make_console_like(self, *, width: int, offset: int, vt: bool):
def _run_exact_width_case(self, *, vt: bool, did_wrap: bool):
width = 10
y = 3
con, wc = self._make_console_like(width=width, offset=0, vt=vt)
con, wc = self._make_console_like(width=width, vt=vt)

with patch.object(con, "_has_wrapped_to_next_row", return_value=did_wrap):
old = ""
Expand All @@ -2166,35 +2166,33 @@ def test_exact_width_line_did_not_wrap_vt_and_legacy(self):

@skipUnless(sys.platform == "win32", "Windows console behavior only")
class TestHasWrappedToNextRow(TestCase):
def _make_console_like(self, *, offset: int):
def _make_console_like(self):
from _pyrepl import windows_console as wc

con = object.__new__(wc.WindowsConsole)
setattr(con, "_WindowsConsole__offset", offset)
setattr(con, "_WindowsConsole__offset", 0)
return con, wc

def test_returns_true_when_wrapped(self):
con, wc = self._make_console_like(offset=0)
con, wc = self._make_console_like()
y = 3

def fake_gcsbi(_h, info):
info.srWindow.Top = 0
info.dwCursorPosition.Y = y + 1
return True

with patch.object(wc, "GetConsoleScreenBufferInfo", side_effect=fake_gcsbi), \
patch.object(wc, "OutHandle", 1):
self.assertIs(con._has_wrapped_to_next_row(y), True)
with patch.object(wc, "GetConsoleScreenBufferInfo", side_effect=fake_gcsbi):
self.assertTrue(con._has_wrapped_to_next_row(y))

def test_returns_false_when_not_wrapped(self):
con, wc = self._make_console_like(offset=0)
con, wc = self._make_console_like()
y = 3

def fake_gcsbi(_h, info):
info.srWindow.Top = 0
info.dwCursorPosition.Y = y
return True

with patch.object(wc, "GetConsoleScreenBufferInfo", side_effect=fake_gcsbi), \
patch.object(wc, "OutHandle", 1):
self.assertIs(con._has_wrapped_to_next_row(y), False)
with patch.object(wc, "GetConsoleScreenBufferInfo", side_effect=fake_gcsbi):
self.assertFalse(con._has_wrapped_to_next_row(y))
Loading