diff --git a/.gitignore b/.gitignore index 8ebd107aa..500df76a8 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ scripts/snicker/candidates.txt .qt_for_python/ cmtdata/ **/build/ +test_venv/ diff --git a/src/jmbase/support.py b/src/jmbase/support.py index 4124694da..726fbe88a 100644 --- a/src/jmbase/support.py +++ b/src/jmbase/support.py @@ -73,6 +73,8 @@ class JMColorizer(GenericColorizer): joinmarket_alert = [''] core_alert = [''] debug_silence = [False] +# Global variable to track whether colored output is enabled +colored_output = [True] class JoinMarketStreamHandler(ColorizingStreamHandler): @@ -182,7 +184,7 @@ def jmprint(msg, level="info"): fmtfn = eval(level) fmtd_msg = fmtfn(msg) - if sys.stdout.isatty(): + if sys.stdout.isatty() and colored_output[0]: print(jm_colorizer.colorize_message(fmtd_msg)) else: print(fmtd_msg) @@ -198,6 +200,8 @@ def set_logging_level(level): handler.setLevel(level) def set_logging_color(colored=False): + # Update the global colored_output setting + colored_output[0] = colored if colored and sys.stdout.isatty(): handler.colorizer = jm_colorizer else: