diff src/core/log.py @ 2154:7cbffd754b4a

core (constants), tools (common/ansi): moved ANSI escape codes to a dedicated class, with helper methods
author Goffi <goffi@goffi.org>
date Thu, 16 Feb 2017 00:44:54 +0100
parents 7f053e1f0b67
children 8b37a62336c3
line wrap: on
line diff
--- a/src/core/log.py	Thu Feb 16 00:40:50 2017 +0100
+++ b/src/core/log.py	Thu Feb 16 00:44:54 2017 +0100
@@ -22,6 +22,7 @@
 # TODO: change formatting from "%s" style to "{}" when moved to Python 3
 
 from sat.core.constants import Const as C
+from sat.tools.common.ansi import ANSI as A
 from sat.core import exceptions
 
 backend = None
@@ -235,10 +236,10 @@
                 for elt in taint_list:
                     elt = elt.upper()
                     try:
-                        ansi = getattr(C, 'ANSI_FG_{}'.format(elt))
+                        ansi = getattr(A, 'FG_{}'.format(elt))
                     except AttributeError:
                         try:
-                            ansi = getattr(C, 'ANSI_{}'.format(elt))
+                            ansi = getattr(A, elt)
                         except AttributeError:
                             # we use raw string if element is unknown
                             ansi = elt
@@ -318,9 +319,9 @@
 
         if cls._color_location:
             return message % {'color_start': start,
-                              'color_end': C.ANSI_RESET}
+                              'color_end': A.RESET}
         else:
-            return '%s%s%s' % (start, message, C.ANSI_RESET)
+            return '%s%s%s' % (start, message, A.RESET)
 
     @staticmethod
     def getProfile():