diff --git a/lib/ClusterShell/CLI/Display.py b/lib/ClusterShell/CLI/Display.py index 223248fa..51410404 100644 --- a/lib/ClusterShell/CLI/Display.py +++ b/lib/ClusterShell/CLI/Display.py @@ -51,13 +51,13 @@ class Display(object): """ Output display class for command line scripts. """ - COLOR_RESULT_FMT = "\033[32m%s\033[0m" - COLOR_STDOUT_FMT = "\033[34m%s\033[0m" - COLOR_STDERR_FMT = "\033[31m%s\033[0m" + COLOR_RESULT_FMT = "\033[92m%s\033[0m" + COLOR_STDOUT_FMT = "\033[94m%s\033[0m" + COLOR_STDERR_FMT = "\033[91m%s\033[0m" COLOR_DIFFHDR_FMT = "\033[1m%s\033[0m" - COLOR_DIFFHNK_FMT = "\033[36m%s\033[0m" - COLOR_DIFFADD_FMT = "\033[32m%s\033[0m" - COLOR_DIFFDEL_FMT = "\033[31m%s\033[0m" + COLOR_DIFFHNK_FMT = "\033[96m%s\033[0m" + COLOR_DIFFADD_FMT = "\033[92m%s\033[0m" + COLOR_DIFFDEL_FMT = "\033[91m%s\033[0m" SEP = "-" * 15 class _KeySet(set): diff --git a/tests/CLIClubakTest.py b/tests/CLIClubakTest.py index 413fabc2..a5a347db 100644 --- a/tests/CLIClubakTest.py +++ b/tests/CLIClubakTest.py @@ -149,9 +149,9 @@ def test_008_color(self): self._clubak_t(["-b", "--color=never"], b"foo: bar\n", _outfmt("foo")) self._clubak_t(["-b", "--color=auto"], b"foo: bar\n", _outfmt("foo")) self._clubak_t(["-L", "--color=always"], b"foo: bar\n", - b"\x1b[34mfoo: \x1b[0m bar\n") + b"\x1b[94mfoo: \x1b[0m bar\n") self._clubak_t(["-b", "--color=always"], b"foo: bar\n", - b"\x1b[34m---------------\nfoo\n---------------\x1b[0m\n bar\n") + b"\x1b[94m---------------\nfoo\n---------------\x1b[0m\n bar\n") def test_009_diff(self): """test clubak (--diff)""" @@ -161,7 +161,7 @@ def test_009_diff(self): self._clubak_t(["--diff"], b"foo1: bar\nfoo2: BAR\nfoo3: bar\nfoo2: end\nfoo1: end\nfoo3: end", b"--- foo[1,3] (2)\n+++ foo2\n@@ -1,2 +1,2 @@\n- bar\n+ BAR\n end\n") self._clubak_t(["--diff", "--color=always"], b"foo1: bar\nfoo2: BAR\nfoo3: bar\nfoo2: end\nfoo1: end\nfoo3: end", - b"\x1b[1m--- foo[1,3] (2)\x1b[0m\n\x1b[1m+++ foo2\x1b[0m\n\x1b[36m@@ -1,2 +1,2 @@\x1b[0m\n\x1b[31m- bar\x1b[0m\n\x1b[32m+ BAR\x1b[0m\n end\n") + b"\x1b[1m--- foo[1,3] (2)\x1b[0m\n\x1b[1m+++ foo2\x1b[0m\n\x1b[96m@@ -1,2 +1,2 @@\x1b[0m\n\x1b[91m- bar\x1b[0m\n\x1b[92m+ BAR\x1b[0m\n end\n") self._clubak_t(["--diff", "-d"], b"foo: bar\n", b"INPUT foo: bar\n", 0, b"line_mode=False gather=True tree_depth=1\n") self._clubak_t(["--diff", "-L"], b"foo1: bar\nfoo2: bar", b'', 2, diff --git a/tests/CLIClushTest.py b/tests/CLIClushTest.py index 57d2ea4d..0d4bbdbe 100644 --- a/tests/CLIClushTest.py +++ b/tests/CLIClushTest.py @@ -35,7 +35,7 @@ def setUp(self): s = "%s: ok\n" % HOSTNAME self.output_ok = s.encode() - s = "\x1b[34m%s: \x1b[0mok\n" % HOSTNAME + s = "\x1b[94m%s: \x1b[0mok\n" % HOSTNAME self.output_ok_color = s.encode() def tearDown(self):