upstream/ansible
1
0
Fork 0
mirror of https://github.com/ansible/ansible.git synced 2026-05-28 04:32:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support terminals that implement truecolor

Browse source
This commit is contained in:
Sviatoslav Sydorenko 2024-08-01 23:15:21 +02:00 committed by Sviatoslav Sydorenko
parent cdb7af094b
commit 415da54e67
No known key found for this signature in database
GPG key ID: 9345E8FEA89CA455
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/constants.py
View file

@ -4,6 +4,7 @@
from __future__ import annotations
import os
import re
from string import ascii_letters, digits
@ -60,6 +61,13 @@ COLOR_CODES = {
'magenta': u'0;35', 'bright magenta': u'1;35',
'normal': u'0',
}
COLOR_CODES = {
name:
str(int(re.search(r'1;(?P<color_code>3\d)', ansi_seq).group('color_code')) + 60)
if os.getenv('COLORTERM') == 'truecolor' and '1;3' in ansi_seq
else ansi_seq
for name, ansi_seq in COLOR_CODES.items()
}
REJECT_EXTS = ['.pyc', '.pyo', '.swp', '.bak', '~', '.rpm', '.md', '.txt', '.rst'] # this is concatenated with other config settings as lists; cannot be tuple
BOOL_TRUE = BOOLEANS_TRUE
COLLECTION_PTYPE_COMPAT = {'module': 'modules'}

7
test/lib/ansible_test/_internal/delegation.py
View file

@ -293,6 +293,13 @@ def generate_command(
ANSIBLE_TEST_CONTENT_ROOT=content_root,
)
if color_term := os.getenv('COLORTERM'):
# NOTE: The current terminal emulator may have this set to `truecolor`
# NOTE: which is important for setting different color defaults. This
# NOTE: may be evident in Kitty that does not interpret the bold ANSI
# NOTE: marker as bright like some of the others.
env_vars['COLORTERM'] = color_term
if isinstance(args.controller, OriginConfig):
# Expose the ansible and ansible_test library directories to the Python environment.
# This is only required when delegation is used on the origin host.

7
test/lib/ansible_test/_internal/util.py
View file

@ -733,6 +733,13 @@ def common_environment() -> dict[str, str]:
env.update(pass_vars(required=required, optional=optional))
if color_term := os.getenv('COLORTERM'):
# NOTE: The current terminal emulator may have this set to `truecolor`
# NOTE: which is important for setting different color defaults. This
# NOTE: may be evident in Kitty that does not interpret the bold ANSI
# NOTE: marker as bright like some of the others.
env['COLORTERM'] = color_term
return env