Better highlighting of tracediff2.

[apitrace] / scripts / highlight.py

diff --git a/scripts/highlight.py b/scripts/highlight.py
index db6a37f9ab4887553757cf4953c91091e39ac6cf..f76b1ab672e5b476f01cbdfc38642156c3fd05f1 100644 (file)
--- a/scripts/highlight.py
+++ b/scripts/highlight.py
@@ -86,11 +86,9 @@ class AnsiHighlighter(PlainHighlighter):
 
     def __init__(self, stream):
         PlainHighlighter.__init__(self, stream)
-        self.isatty = stream.isatty()
 
     def _escape(self, code):
-        if self.isatty:
-            self.stream.write(self._csi + code)
+        self.stream.write(self._csi + code)
 
     def normal(self):
         self._escape(self._normal)
@@ -182,11 +180,14 @@ class WindowsConsoleHighlighter(PlainHighlighter):
         pass
 
 
-def Highlighter(stream = sys.stdout):
-    if platform.system() == 'Windows':
-        return WindowsConsoleHighlighter(stream)
+def Highlighter(stream = sys.stdout, force = False):
+    if force or stream.isatty():
+        if platform.system() == 'Windows':
+            return WindowsConsoleHighlighter(stream)
+        else:
+            return AnsiHighlighter(stream)
     else:
-        return AnsiHighlighter(stream)
+        return PlainHighlighter(stream)
 
 
 __all__ = [