From 3e03822702e3ac679ea7a685b72765f9c6c05890 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Wed, 24 Jun 2026 10:43:18 -0700 Subject: [PATCH 1/4] Use ANSI Escape Codes from Colorize --- Lib/_pyrepl/render.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Lib/_pyrepl/render.py b/Lib/_pyrepl/render.py index b821f35d850825e..66b90e5bb8a0f77 100644 --- a/Lib/_pyrepl/render.py +++ b/Lib/_pyrepl/render.py @@ -4,6 +4,8 @@ from dataclasses import dataclass, field from typing import Literal, Protocol, Self +from Lib._colorize import ANSIColors + from .utils import ANSI_ESCAPE_SEQUENCE, THEME, StyleRef, str_width from .types import CursorXY @@ -55,7 +57,7 @@ def _style_escape(style: StyleRef) -> str: def _update_terminal_state(state: str, escape: str) -> str: - if escape in {"\x1b[0m", "\x1b[m"}: + if escape in {ANSIColors.RESET, "\x1b[m"}: return "" return state + escape @@ -344,14 +346,14 @@ def render_cells( target_escape += visual_style if target_escape != active_escape: if active_escape: - rendered.append("\x1b[0m") + rendered.append(ANSIColors.RESET) if target_escape: rendered.append(target_escape) active_escape = target_escape rendered.append(cell.text) if active_escape: - rendered.append("\x1b[0m") + rendered.append(ANSIColors.RESET) return "".join(rendered) From 19fd3226d199a5fe938875dd401962dd78475ea4 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Wed, 24 Jun 2026 10:43:52 -0700 Subject: [PATCH 2/4] Print ANSI Color reset on finish and restore --- Lib/_pyrepl/unix_console.py | 4 ++++ Lib/_pyrepl/windows_console.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Lib/_pyrepl/unix_console.py b/Lib/_pyrepl/unix_console.py index 9a4f8e0c623abfa..985ba14fe20f935 100644 --- a/Lib/_pyrepl/unix_console.py +++ b/Lib/_pyrepl/unix_console.py @@ -36,6 +36,8 @@ from fcntl import ioctl from typing import TYPE_CHECKING, overload +from Lib._colorize import ANSIColors + from . import terminfo from .console import Console, Event from .fancy_termios import tcgetattr, tcsetattr, TermState @@ -517,6 +519,7 @@ def restore(self) -> None: Restore the console to the default state """ trace("unix.restore") + self.__write(ANSIColors.RESET) self.__disable_bracketed_paste() self.__maybe_write_code(self._rmkx) self.flushoutput() @@ -654,6 +657,7 @@ def finish(self): while y >= 0 and not rendered_lines[y].text: y -= 1 self.__move(0, min(y, self.height + self.__offset - 1)) + self.__write(ANSIColors.RESET) self.__write("\n\r") self.flushoutput() diff --git a/Lib/_pyrepl/windows_console.py b/Lib/_pyrepl/windows_console.py index c1f9a19545d35fd..11f85a0e8c47c0e 100644 --- a/Lib/_pyrepl/windows_console.py +++ b/Lib/_pyrepl/windows_console.py @@ -39,6 +39,8 @@ ) from ctypes import Structure, POINTER, Union from typing import TYPE_CHECKING + +from Lib._colorize import ANSIColors from .console import Event, Console from .render import ( EMPTY_RENDER_LINE, @@ -480,6 +482,7 @@ def prepare(self) -> None: def restore(self) -> None: trace("windows.restore") if self.__vt_support: + self.__write(ANSIColors.RESET) # Recover to original mode before running REPL self._disable_bracketed_paste() if not SetConsoleMode(InHandle, self.__original_input_mode): @@ -647,6 +650,7 @@ def finish(self) -> None: while y >= 0 and not rendered_lines[y].text: y -= 1 self._move_relative(0, min(y, self.height + self.__offset - 1)) + self.__write(ANSIColors.RESET) self.__write("\r\n") def flushoutput(self) -> None: From 6edc20f50581c1202047d19039d0988dcf05b4c4 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2026 18:00:41 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/macOS/2026-06-24-18-00-39.gh-issue-152068.ThsmJU.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/macOS/2026-06-24-18-00-39.gh-issue-152068.ThsmJU.rst diff --git a/Misc/NEWS.d/next/macOS/2026-06-24-18-00-39.gh-issue-152068.ThsmJU.rst b/Misc/NEWS.d/next/macOS/2026-06-24-18-00-39.gh-issue-152068.ThsmJU.rst new file mode 100644 index 000000000000000..9ec8413b4ac424c --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2026-06-24-18-00-39.gh-issue-152068.ThsmJU.rst @@ -0,0 +1 @@ +Fixes a bug when a line was split (particularly on macOS Terminal.app) in the middle of a colorized keyword, causing the ANSI Color Reset sequence (ESC0m) to not be properly printed, causing the output to be colored when it shouldn't From 3d363f1de9ad03bcf6f7d9c6e38b349863dec6e8 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Wed, 24 Jun 2026 13:29:59 -0700 Subject: [PATCH 4/4] Update imports --- Lib/_pyrepl/render.py | 4 ++-- Lib/_pyrepl/unix_console.py | 2 +- Lib/_pyrepl/windows_console.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/_pyrepl/render.py b/Lib/_pyrepl/render.py index 66b90e5bb8a0f77..b835778e366c539 100644 --- a/Lib/_pyrepl/render.py +++ b/Lib/_pyrepl/render.py @@ -4,10 +4,10 @@ from dataclasses import dataclass, field from typing import Literal, Protocol, Self -from Lib._colorize import ANSIColors +from _colorize import ANSIColors -from .utils import ANSI_ESCAPE_SEQUENCE, THEME, StyleRef, str_width from .types import CursorXY +from .utils import ANSI_ESCAPE_SEQUENCE, THEME, StyleRef, str_width type RenderStyle = StyleRef | str | None type LineUpdateKind = Literal[ diff --git a/Lib/_pyrepl/unix_console.py b/Lib/_pyrepl/unix_console.py index 985ba14fe20f935..8edd1c36a7232d7 100644 --- a/Lib/_pyrepl/unix_console.py +++ b/Lib/_pyrepl/unix_console.py @@ -36,7 +36,7 @@ from fcntl import ioctl from typing import TYPE_CHECKING, overload -from Lib._colorize import ANSIColors +from _colorize import ANSIColors from . import terminfo from .console import Console, Event diff --git a/Lib/_pyrepl/windows_console.py b/Lib/_pyrepl/windows_console.py index 11f85a0e8c47c0e..3768a22ad16f7bb 100644 --- a/Lib/_pyrepl/windows_console.py +++ b/Lib/_pyrepl/windows_console.py @@ -40,7 +40,8 @@ from ctypes import Structure, POINTER, Union from typing import TYPE_CHECKING -from Lib._colorize import ANSIColors +from _colorize import ANSIColors + from .console import Event, Console from .render import ( EMPTY_RENDER_LINE,