From c49837fae0fa82fe43c4fa855ec0737455096d44 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Thu, 24 Aug 2017 12:46:22 -0700 Subject: [PATCH] Remove all colors in output when --no-ansi is set Signed-off-by: Joffrey F --- compose/cli/main.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compose/cli/main.py b/compose/cli/main.py index c07de53f2..83bc7d58c 100644 --- a/compose/cli/main.py +++ b/compose/cli/main.py @@ -97,8 +97,10 @@ def dispatch(): {'options_first': True, 'version': get_version_info('compose')}) options, handler, command_options = dispatcher.parse(sys.argv[1:]) - setup_console_handler(console_handler, options.get('--verbose')) + setup_console_handler(console_handler, options.get('--verbose'), options.get('--no-ansi')) setup_parallel_logger(options.get('--no-ansi')) + if options.get('--no-ansi'): + command_options['--no-color'] = True return functools.partial(perform_command, options, handler, command_options) @@ -134,8 +136,8 @@ def setup_parallel_logger(noansi): compose.parallel.ParallelStreamWriter.set_noansi() -def setup_console_handler(handler, verbose): - if handler.stream.isatty(): +def setup_console_handler(handler, verbose, noansi=False): + if handler.stream.isatty() and noansi is False: format_class = ConsoleWarningFormatter else: format_class = logging.Formatter