Skip to content

gh-157928: PyREPL detect OSC sequences #157932

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

Merged
brettcannon merged 9 commits into from
Oct 29, 2026
Merged

gh-157928: PyREPL detect OSC sequences #157932

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb85821
gh-#157928: PyREPL Detect OSC sequences
edvilme Sep 21, 2026
d88732f
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 21, 2026
995f364
Add negative test
edvilme Sep 21, 2026
ce6a886
Merge branch 'main' into pyrepl-osc-escape-sequences
edvilme Sep 22, 2026
81df8f9
Apply batched suggestions from code review
edvilme Oct 1, 2026
4c1df46
Update ANSI_ESCAPE_SEQUENCE comments
edvilme Oct 1, 2026
afbef18
Apply suggestion from @brettcannon
edvilme Oct 2, 2026
97ba530
Update test with clearer explanation
edvilme Oct 2, 2026
46c3256
Update test
edvilme Oct 2, 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
4 changes: 3 additions & 1 deletion Lib/_pyrepl/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
from .trace import trace


ANSI_ESCAPE_SEQUENCE = re.compile(r"\x1b\[[ -@]*[A-~]")
ANSI_ESCAPE_SEQUENCE = re.compile(
r"\x1b(?:\[[ -@]*[A-~]|\][^\x1b\x07]*(?:\x07|\x1b\\))"
Comment thread
edvilme marked this conversation as resolved.
Resolved
)
ZERO_WIDTH_BRACKET = re.compile(r"\x01.*?\x02")
ZERO_WIDTH_TRANS = str.maketrans({"\x01": "", "\x02": ""})
IDENTIFIERS_AFTER = frozenset({"def", "class"})
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_pyrepl/test_render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ def test_from_rendered_text_empty_string(self):
self.assertEqual(line.text, "")
self.assertEqual(line.width, 0)

def test_from_rendered_text_with_osc_control(self):
osc = "\x1b]633;A\x1b\\"
line = RenderLine.from_rendered_text(f"{osc}>>> ")

self.assertEqual(line.width, 4)
self.assertEqual(line.cells[0].controls, (osc,))
self.assertEqual(line.cells[0].text, "")
self.assertEqual(line.text, f"{osc}>>> ")
Comment thread
edvilme marked this conversation as resolved.
Resolved

def test_from_rendered_text_with_non_sgr_controls(self):
# \x1b[H is a cursor-home control (not SGR since it doesn't end with 'm')
line = RenderLine.from_rendered_text("\x1b[Hx")
Expand Down
6 changes: 6 additions & 0 deletions Lib/test/test_pyrepl/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ def test_wlen(self):
self.assertEqual(wlen('e\N{COMBINING ACUTE ACCENT}'), 1)
self.assertEqual(wlen('a\N{ZERO WIDTH JOINER}b'), 2)

def test_wlen_with_osc_sequence(self):
self.assertEqual(wlen("\x1b]633;A\x07>>> "), 4)
Comment thread
edvilme marked this conversation as resolved.
Resolved

def test_wlen_with_unterminated_osc_sequence(self):
self.assertEqual(wlen("\x1b]633;A"), 7)
Comment thread
edvilme marked this conversation as resolved.
Resolved

def test_prev_next_window(self):
def gen_normal():
yield 1
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2026-09-21-21-07-12.gh-issue-157928.ZPlNYC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Correctly detect and handle OSC sequences in PyREPL
Comment thread
edvilme marked this conversation as resolved.
Resolved
Loading