Fix for an Issue #140

stamparm · stamparm · commit 31ceb0cb6ccd · 2012-08-07T10:57:29.000+02:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -701,7 +701,7 @@ def setColor(message, bold=False):
     retVal = message
     level = extractRegexResult(r"\[(?P<result>[A-Z ]+)\]", message) or kb.get("stickyLevel")
 
-    if message and hasattr(LOGGER_HANDLER, "level_map"):  # colorizing handler
+    if message and getattr(LOGGER_HANDLER, "is_tty", False):  # colorizing handler
         if bold:
             retVal = colored(message, color=None, on_color=None, attrs=("bold",))
         elif level:
diff --git a/thirdparty/ansistrm/ansistrm.py b/thirdparty/ansistrm/ansistrm.py
@@ -51,6 +51,8 @@ def emit(self, record):
             stream = self.stream
 
             if not self.is_tty:
+                if message and message[0] == "\r":
+                    message = message[1:]
                 stream.write(message)
             else:
                 self.output_colorized(message)
@@ -122,7 +124,7 @@ def output_colorized(self, message):
                         ctypes.windll.kernel32.SetConsoleTextAttribute(h, color)
 
     def colorize(self, message, record):
-        if record.levelno in self.level_map:
+        if record.levelno in self.level_map and self.is_tty:
             bg, fg, bold = self.level_map[record.levelno]
             params = []
 
