diff --git a/Interlace/lib/core/output.py b/Interlace/lib/core/output.py index 1eb5209..aa2050b 100644 --- a/Interlace/lib/core/output.py +++ b/Interlace/lib/core/output.py @@ -1,9 +1,6 @@ from enum import IntEnum from time import localtime, strftime -from colorclass import Color -from colorclass import disable_all_colors - from Interlace.lib.core.__version__ import __version__ @@ -22,9 +19,7 @@ class bcolors: class OutputHelper(object): def __init__(self, arguments): - if arguments.nocolor: - disable_all_colors() - + self._no_color = arguments.nocolor self.verbose = arguments.verbose self.silent = arguments.silent self.seperator = "=====================================================" @@ -42,11 +37,18 @@ class OutputHelper(object): if level == 0 and not self.verbose: return - formatting = { - 0: f'{bcolors.OKBLUE}[VERBOSE]{bcolors.ENDC}', - 1: f'{bcolors.OKGREEN}[THREAD]{bcolors.ENDC}', - 3: f'{bcolors.FAIL}[ERROR]{bcolors.ENDC}' - } + if self._no_color: + formatting = { + 0: f'{bcolors.OKBLUE}[VERBOSE]{bcolors.ENDC}', + 1: f'{bcolors.OKGREEN}[THREAD]{bcolors.ENDC}', + 3: f'{bcolors.FAIL}[ERROR]{bcolors.ENDC}' + } + else: + formatting = { + 0: '[VERBOSE]', + 1: '[THREAD]', + 3: '[ERROR]' + } leader = formatting.get(level, '[#]') diff --git a/requirements.txt b/requirements.txt index aff64d3..bc01fea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -colorclass==2.2.2 netaddr==0.7.20 tqdm==4.62.3