From 0c38128c4e459aa6fb783c86bea51ae2e19ac9b7 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ghostwheel42@users.noreply.github.com>
Date: Thu, 11 Mar 2021 18:38:00 +0100
Subject: [PATCH] Add pygments to requirements

---
 core/admin/mailu/schemas.py      | 20 ++++++--------------
 core/admin/requirements-prod.txt |  1 +
 core/admin/requirements.txt      |  1 +
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/core/admin/mailu/schemas.py b/core/admin/mailu/schemas.py
index fdd766b3..28a5d6f4 100644
--- a/core/admin/mailu/schemas.py
+++ b/core/admin/mailu/schemas.py
@@ -21,16 +21,11 @@ from flask_marshmallow import Marshmallow
 
 from OpenSSL import crypto
 
-try:
-    from pygments import highlight
-    from pygments.token import Token
-    from pygments.lexers import get_lexer_by_name
-    from pygments.lexers.data import YamlLexer
-    from pygments.formatters import get_formatter_by_name
-except ModuleNotFoundError:
-    COLOR_SUPPORTED = False
-else:
-    COLOR_SUPPORTED = True
+from pygments import highlight
+from pygments.token import Token
+from pygments.lexers import get_lexer_by_name
+from pygments.lexers.data import YamlLexer
+from pygments.formatters import get_formatter_by_name
 
 from mailu import models, dkim
 
@@ -92,10 +87,7 @@ class Logger:
         self.debug = debug
         self.print = print
 
-        if want_color and not COLOR_SUPPORTED:
-            raise ValueError('Please install pygments to colorize output')
-
-        self.color = want_color or (can_color and COLOR_SUPPORTED)
+        self.color = want_color or can_color
 
         self._counter = Counter()
         self._schemas = {}
diff --git a/core/admin/requirements-prod.txt b/core/admin/requirements-prod.txt
index 7620fd95..5c291e24 100644
--- a/core/admin/requirements-prod.txt
+++ b/core/admin/requirements-prod.txt
@@ -36,6 +36,7 @@ marshmallow-sqlalchemy==0.24.1
 passlib==1.7.4
 psycopg2==2.8.2
 pycparser==2.19
+Pygments==2.8.1
 pyOpenSSL==19.0.0
 python-dateutil==2.8.0
 python-editor==1.0.4
diff --git a/core/admin/requirements.txt b/core/admin/requirements.txt
index f9d175b3..46500295 100644
--- a/core/admin/requirements.txt
+++ b/core/admin/requirements.txt
@@ -17,6 +17,7 @@ gunicorn
 tabulate
 PyYAML
 PyOpenSSL
+Pygments
 dnspython
 bcrypt
 tenacity