core (constants), tools (common/ansi): moved ANSI escape codes to a dedicated class, with helper methods
This commit is contained in:
parent
84fd46d62c
commit
bc5f57702f
1 changed files with 54 additions and 15 deletions
|
|
@ -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 @@ class ConfigureBase(object):
|
|||
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 @@ class ConfigureBase(object):
|
|||
|
||||
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():
|
||||
|
|
|
|||
Loading…
Reference in a new issue