Skip to content

Expand CSS shorthand hex colors before ANSI conversion #92

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
ShahadatTest wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expand CSS shorthand hex colors before ANSI conversion #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions humanfriendly/terminal/html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,9 @@ def parse_color(self, value):
elif length == 3:
# Three hex digits (shorthand).
return (
int(value[0], 16),
int(value[1], 16),
int(value[2], 16),
int(value[0] * 2, 16),
int(value[1] * 2, 16),
int(value[2] * 2, 16),
)
# Try to recognize a named color.
value = value.lower()
Expand Down
12 changes: 12 additions & 0 deletions humanfriendly/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,18 @@ def callback(text):
title="VPS hosting" rel="external"&gt;True</a>
''')

def test_html_shorthand_colors(self):
"""CSS short hex colors expand each digit before ANSI rendering."""
from humanfriendly.terminal.html import HTMLConverter
converter = HTMLConverter()
for short, full, rgb in [('#fff', '#ffffff', (255, 255, 255)),
('#aBc', '#aaBBcc', (170, 187, 204)),
('#123', '#112233', (17, 34, 51))]:
self.assertEqual(converter.parse_color(short), rgb)
for prop in ('color', 'background-color'):
template = '<span style="%s: %%s">text</span>' % prop
self.assertEqual(html_to_ansi(template % short), html_to_ansi(template % full))

def test_generate_output(self):
"""Test the :func:`humanfriendly.terminal.output()` function."""
text = "Standard output generated by output()"
Expand Down