|
17 | 17 |
|
18 | 18 | import re
|
19 | 19 | import sys
|
20 |
| -import colorama |
21 | 20 | from os import stat, walk
|
22 | 21 | from copy import copy
|
23 | 22 | from time import time, sleep
|
@@ -50,23 +49,6 @@ def print_notify(event, silent=False):
|
50 | 49 | if not silent:
|
51 | 50 | print '%s: %s' % (event['action'].title(), basename(event['file']))
|
52 | 51 |
|
53 |
| -def print_notify_color(event, silent=False): |
54 |
| - """ Default command line notification with colors |
55 |
| - """ |
56 |
| - from colorama import Fore, Back, Style |
57 |
| - |
58 |
| - if event['type'] in ['info', 'debug']: |
59 |
| - print Fore.GREEN + event['message'] + Fore.RESET |
60 |
| - |
61 |
| - elif event['type'] == 'cc': |
62 |
| - event['severity'] = event['severity'].title() |
63 |
| - event['file'] = basename(event['file']) |
64 |
| - print Fore.YELLOW + '[%(severity)s] %(file)s@%(line)s: %(message)s'% event + Fore.RESET |
65 |
| - |
66 |
| - elif event['type'] == 'progress': |
67 |
| - if not silent: |
68 |
| - print '%s: %s' % (event['action'].title(), basename(event['file'])) |
69 |
| - |
70 | 52 | def print_notify_verbose(event, silent=False):
|
71 | 53 | """ Default command line notification with more verbose mode
|
72 | 54 | """
|
@@ -239,7 +221,7 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False)
|
239 | 221 |
|
240 | 222 | self.legacy_ignore_dirs = LEGACY_IGNORE_DIRS - set([target.name, LEGACY_TOOLCHAIN_NAMES[self.name]])
|
241 | 223 |
|
242 |
| - self.notify_fun = notify if notify is not None else print_notify_color |
| 224 | + self.notify_fun = notify if notify is not None else print_notify |
243 | 225 | self.options = options if options is not None else []
|
244 | 226 |
|
245 | 227 | self.macros = macros or []
|
@@ -731,9 +713,6 @@ def tool_error(self, message):
|
731 | 713 | def var(self, key, value):
|
732 | 714 | self.notify({'type': 'var', 'key': key, 'val': value})
|
733 | 715 |
|
734 |
| -from colorama import init |
735 |
| -init() |
736 |
| - |
737 | 716 | from workspace_tools.settings import ARM_BIN
|
738 | 717 | from workspace_tools.settings import GCC_ARM_PATH, GCC_CR_PATH, GCC_CS_PATH, CW_EWL_PATH, CW_GCC_PATH
|
739 | 718 | from workspace_tools.settings import IAR_PATH
|
|
0 commit comments