From ade31017583542aae13aabf819cb9f4fd7bea7b7 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 7 Jul 2021 10:43:17 +1200
Subject: py/samba/logger: respect NO_COLOR env variable

As per https://no-color.org/

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
---
 python/samba/logger.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'python')

diff --git a/python/samba/logger.py b/python/samba/logger.py
index 667c6487a51..7fb2199e031 100644
--- a/python/samba/logger.py
+++ b/python/samba/logger.py
@@ -19,6 +19,7 @@
 import sys
 import logging
 from samba.colour import GREY, YELLOW, GREEN, RED, DARK_RED, C_NORMAL
+from samba.colour import is_colour_wanted
 
 LEVEL_COLORS = {
     logging.CRITICAL: DARK_RED,
@@ -55,8 +56,7 @@ def get_samba_logger(
                  (quiet and logging.WARNING) or logging.INFO)
 
     logger.setLevel(level)
-
-    if (hasattr(stream, 'isatty') and stream.isatty()):
+    if is_colour_wanted(stream):
         Formatter = ColoredFormatter
     else:
         Formatter = logging.Formatter
-- 
cgit v1.2.3