Skip to content

Clean up error output: color reset sequence and stat failure message #482

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ammachado wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clean up error output: color reset sequence and stat failure message #482

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
2 changes: 1 addition & 1 deletion did/stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def check(self) -> None:
try:
f.result()
except did.base.ReportError as error:
log.error("Skipping %s due to %s", f, error)
log.error("%s", error)
sys.stdout.flush()
sys.stderr.flush()

Expand Down
2 changes: 1 addition & 1 deletion did/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ def color(
light_code = (1 if light else 0)
# Starting and finishing sequence
start = f"\033[{light_code}{text_color_code}{background_code}m"
finish = "\033[1;m"
finish = "\033[0m"
return "".join([start, text, finish])


Expand Down
6 changes: 3 additions & 3 deletions tests/unit/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def test_color_function_exists() -> None:
# No color sets
res = did.utils.color(
"text", text_color=None, background=None, light=False, enabled=True)
assert res == "\033[0mtext\033[1;m"
assert res == "\033[0mtext\033[0m"
# Disabled
res = did.utils.color(
"text", text_color=None, background=None, light=False, enabled=False)
Expand All @@ -256,11 +256,11 @@ def test_color_function_exists() -> None:
# Known color
res = did.utils.color(
"text", text_color="red", background=None, light=False, enabled=True)
assert res == "\033[0;31mtext\033[1;m"
assert res == "\033[0;31mtext\033[0m"
# Light version
res = did.utils.color(
"text", text_color="red", background=None, light=True, enabled=True)
assert res == "\033[1;31mtext\033[1;m"
assert res == "\033[1;31mtext\033[0m"

# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# strtobool
Expand Down
Loading