commit b412d245dc43c6ac8b7eaa4f75d6e54d12dedd35
author José Fonseca <jose.r.fonseca@gmail.com> Thu Mar 15 23:43:52 2012 +0000
committer José Fonseca <jose.r.fonseca@gmail.com> Thu Mar 15 23:43:52 2012 +0000
tree 84f95af62c2e23d7cf458be07dd51f35fb8b8beb
parent c97429637875c103a3dcf082df01f8597d0ed145

Better highlighting of tracediff2.

scripts/highlight.py

diff --git a/scripts/highlight.py b/scripts/highlight.py
index db6a37f..f76b1ab 100644
--- a/scripts/highlight.py
+++ b/scripts/highlight.py
@@ -86,11 +86,9 @@
 
     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 @@
         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__ = [