From: Douglas Bagnall <douglas@halo.gen.nz>
Date: Tue, 2 Jan 2018 20:20:09 +0000 (+1300)
Subject: samba_kcc: kcc.debug module defers to samba.colour
X-Git-Tag: samba-4.8.0rc1~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e579d5bd48dfc7bc93ecc126d42fd4389ded0e28;p=thirdparty%2Fsamba.git

samba_kcc: kcc.debug module defers to samba.colour

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/colour.py b/python/samba/colour.py
index 4f6cac0645a..b3d9a718e0e 100644
--- a/python/samba/colour.py
+++ b/python/samba/colour.py
@@ -39,6 +39,9 @@ def _gen_ansi_colours():
 
 _gen_ansi_colours()
 
+# kcc.debug uses these aliases (which make visual sense)
+PURPLE = DARK_MAGENTA
+GREY = DARK_WHITE
 
 def xterm_256_colour(n, bg=False, bold=False):
     weight = '01;' if bold else ''
diff --git a/python/samba/kcc/debug.py b/python/samba/kcc/debug.py
index 340510ffeed..4fab33a5089 100644
--- a/python/samba/kcc/debug.py
+++ b/python/samba/kcc/debug.py
@@ -30,22 +30,14 @@ WARN = logger.warning
 
 
 #colours for prettier logs
-C_NORMAL = "\033[00m"
-DARK_RED = "\033[00;31m"
-RED = "\033[01;31m"
-DARK_GREEN = "\033[00;32m"
-GREEN = "\033[01;32m"
-YELLOW = "\033[01;33m"
-DARK_YELLOW = "\033[00;33m"
-DARK_BLUE = "\033[00;34m"
-BLUE = "\033[01;34m"
-PURPLE = "\033[00;35m"
-MAGENTA = "\033[01;35m"
-DARK_CYAN = "\033[00;36m"
-CYAN = "\033[01;36m"
-GREY = "\033[00;37m"
-WHITE = "\033[01;37m"
-REV_RED = "\033[01;41m"
+from samba.colour import C_NORMAL, REV_RED
+from samba.colour import DARK_RED, RED
+from samba.colour import DARK_GREEN, GREEN
+from samba.colour import DARK_YELLOW, YELLOW
+from samba.colour import DARK_BLUE, BLUE
+from samba.colour import PURPLE, MAGENTA
+from samba.colour import DARK_CYAN, CYAN
+from samba.colour import GREY, WHITE
 
 
 def _color_debug(*args, **kwargs):