8000 gh-128595: Default to stdout isatty for colour detection instead of stderr by hugovk · Pull Request #128498 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-128595: Default to stdout isatty for colour detection instead of stderr #128498

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
merged 18 commits into from
Jan 20, 2025
Merged

gh-128595: Default to stdout isatty for colour detection instead of stderr #128498

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4ad090d
Add test class helper to force no terminal colour
hugovk Dec 11, 2024
ab76e1b
Refactor
hugovk Dec 11, 2024
bb90f89
Default to stdout isatty for colour detection instead of stderr
hugovk Jan 4, 2025
172f8c3
Add NEWS
hugovk Jan 7, 2025
bf31943
Merge branch 'main' into 3.14-color-default-stdout
hugovk Jan 13, 2025
b7855ad
Fix merge conflict
hugovk Jan 13, 2025
8e24cc8
Remove unused import
hugovk Jan 13, 2025
2b88c85
Check can_colorize using same output stream as traceback
hugovk Jan 9, 2025
4aa46c5
Check can_colorize using same output stream as unittest
hugovk Jan 9, 2025
d0ce622
Check get_colors using the same output stream
hugovk Jan 13, 2025
7debe69
Apply suggestions from code review
hugovk Jan 13, 2025
6faf53c
Add missing parenthesis
hugovk Jan 13, 2025
e1547d0
Name the argument
hugovk Jan 13, 2025
7612bff
Also print skips to stderr
hugovk Jan 13, 2025
44828f0
Check file not sys.stdout
hugovk Jan 14, 2025
36eb18e
file=stream
hugovk Jan 14, 2025
f5857b5
Print to stdout
hugovk Jan 14, 2025
3047d2a
Log skipped to stdout, log failures to stderr
hugovk Jan 14, 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
Prev Previous commit
Next Next commit
Check get_colors using the same output stream
  • Loading branch information
@hugovk
hugovk committed Jan 13, 2025
commit d0ce62201d6dd1670ae0de977c5fa141aa622bb5
7 changes: 5 additions & 2 deletions Lib/_colorize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ class ANSIColors:
setattr(NoColors, attr, "")


def get_colors(colorize: bool = False) -> ANSIColors:
if colorize or can_colorize():
def get_colors(colorize: bool = False, *, file=None) -> ANSIColors:
if file is None:
file = sys.stdout

if colorize or can_colorize(file=file):
return ANSIColors()
else:
return NoColors
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/libregrtest/single.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def test_func():
def _runtest_env_changed_exc(result: TestResult, runtests: RunTests,
display_failure: bool = True) -> None:
# Handle exceptions, detect environment changes.
ansi = get_colors()
ansi = get_colors(file=sys.stderr)
red, reset, yellow = ansi.RED, ansi.RESET, ansi.YELLOW

# Reset the environment_altered flag to detect if a test altered
Expand Down Expand Up @@ -303,7 +303,7 @@ def run_single_test(test_name: TestName, runtests: RunTests) -> TestResult:
If runtests.use_junit, xml_data is a list containing each generated
testsuite element.
"""
ansi = get_colors()
ansi = get_colors(file=sys.stderr)
red, reset, yellow = ansi.BOLD_RED, ansi.RESET, ansi.YELLOW

start_time = time.perf_counter()
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2839,7 +2839,7 @@ def no_color():
from .os_helper import EnvironmentVarGuard

with (
swap_attr(_colorize, "can_colorize", lambda: False),
swap_attr(_colorize, "can_colorize", lambda file=None: False),
EnvironmentVarGuard() as env,
):
for var in {"FORCE_COLOR", "NO_COLOR", "PYTHON_COLORS"}:
Expand Down
6 changes: 4 additions & 2 deletions Lib/unittest/runner.py
View file
Open in desktop
A303
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ def __init__(self, stream, descriptions, verbosity, *, durations=None):
self.showAll = verbosity > 1
self.dots = verbosity == 1
self.descriptions = descriptions
self._ansi = get_colors()
file = sys.stderr if stream == "<stderr>" else None
self._ansi = get_colors(file=file)
self._newline = True
self.durations = durations

Expand Down Expand Up @@ -286,7 +287,8 @@ def run(self, test):
expected_fails, unexpected_successes, skipped = results

infos = []
ansi = get_colors()
file = sys.stderr if self.stream == "<stderr>" else None
ansi = get_colors(file=file)
bold_red = ansi.BOLD_RED
green = ansi.GREEN
red = ansi.RED
Expand Down
Loading
0