From e4c83e162dfa37189b8eac506b07ec6f78a5b5d0 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ghostwheel42@users.noreply.github.com>
Date: Tue, 16 Feb 2021 17:59:43 +0100
Subject: [PATCH] fixed colorize auto detection

---
 core/admin/mailu/manage.py  | 6 +++---
 core/admin/mailu/schemas.py | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/admin/mailu/manage.py b/core/admin/mailu/manage.py
index 756400ad..bef49faa 100644
--- a/core/admin/mailu/manage.py
+++ b/core/admin/mailu/manage.py
@@ -19,7 +19,7 @@ from flask.cli import FlaskGroup, with_appcontext
 from marshmallow.exceptions import ValidationError
 
 from . import models
-from .schemas import MailuSchema, get_schema, get_fieldspec, colorize, RenderJSON, HIDDEN
+from .schemas import MailuSchema, get_schema, get_fieldspec, colorize, canColorize, RenderJSON, HIDDEN
 
 
 db = models.db
@@ -351,7 +351,7 @@ def config_import(verbose=0, secrets=False, quiet=False, color=False, update=Fal
         verbose = 2
 
     color_cfg = {
-        'color': color or sys.stdout.isatty(),
+        'color': color or (canColorize and sys.stdout.isatty()),
         'lexer': 'python',
         'strip': True,
     }
@@ -598,7 +598,7 @@ def config_export(full=False, secrets=False, color=False, dns=False, output=None
     }
 
     schema = MailuSchema(only=only, context=context)
-    color_cfg = {'color': color or output.isatty()}
+    color_cfg = {'color': color or (canColorize and output.isatty())}
 
     if as_json:
         schema.opts.render_module = RenderJSON
diff --git a/core/admin/mailu/schemas.py b/core/admin/mailu/schemas.py
index 7d0393f0..6a8303c5 100644
--- a/core/admin/mailu/schemas.py
+++ b/core/admin/mailu/schemas.py
@@ -27,9 +27,9 @@ try:
     from pygments.lexers.data import YamlLexer
     from pygments.formatters import get_formatter_by_name
 except ModuleNotFoundError:
-    COLOR_SUPPORTED = False
+    canColorize = False
 else:
-    COLOR_SUPPORTED = True
+    canColorize = True
 
 from . import models, dkim
 
@@ -99,11 +99,11 @@ def colorize(data, lexer='yaml', formatter='terminal', color=None, strip=False):
     """ add ANSI color to data """
     if color is None:
         # autodetect colorize
-        color = COLOR_SUPPORTED
+        color = canColorize
     if not color:
         # no color wanted
         return data
-    if not COLOR_SUPPORTED:
+    if not canColorize:
         # want color, but not supported
         raise ValueError('Please install pygments to colorize output')