Skip to content

gh-152068: Reset PyREPL Colors on prompt finish #152108

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
edvilme wants to merge 4 commits into
base: main
Choose a base branch
from
+16 −4
Open

gh-152068: Reset PyREPL Colors on prompt finish #152108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e03822
Use ANSI Escape Codes from Colorize
edvilme Jun 24, 2026
19fd322
Print ANSI Color reset on finish and restore
edvilme Jun 24, 2026
6edc20f
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 24, 2026
3d363f1
Update imports
edvilme Jun 24, 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
10 changes: 6 additions & 4 deletions Lib/_pyrepl/render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
from dataclasses import dataclass, field
from typing import Literal, Protocol, Self

from .utils import ANSI_ESCAPE_SEQUENCE, THEME, StyleRef, str_width
from _colorize import ANSIColors

from .types import CursorXY
from .utils import ANSI_ESCAPE_SEQUENCE, THEME, StyleRef, str_width

type RenderStyle = StyleRef | str | None
type LineUpdateKind = Literal[
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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)


Expand Down
4 changes: 4 additions & 0 deletions Lib/_pyrepl/unix_console.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
from fcntl import ioctl
from typing import TYPE_CHECKING, overload

from _colorize import ANSIColors

from . import terminfo
from .console import Console, Event
from .fancy_termios import tcgetattr, tcsetattr, TermState
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()

Expand Down
5 changes: 5 additions & 0 deletions Lib/_pyrepl/windows_console.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
)
from ctypes import Structure, POINTER, Union
from typing import TYPE_CHECKING

from _colorize import ANSIColors

from .console import Event, Console
from .render import (
EMPTY_RENDER_LINE,
Expand Down Expand Up @@ -480,6 +483,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):
Expand Down Expand Up @@ -647,6 +651,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:
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/macOS/2026-06-24-18-00-39.gh-issue-152068.ThsmJU.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading