gltrace: Simplify AttribArray further.

[apitrace] / scripts / tracediff.py

diff --git a/scripts/tracediff.py b/scripts/tracediff.py
index 68d967764d5ab0f1983ddf370d3d85968c74c077..09135101daf842dab98e26fc27ccdaa28b33a50f 100755 (executable)
--- a/scripts/tracediff.py
+++ b/scripts/tracediff.py
@@ -180,7 +180,7 @@ class ExternalDiffer(Differ):
 #
 
 from unpickle import Unpickler, Dumper, Rebuilder
-from highlight import ColorHighlighter, LessHighlighter
+from highlight import PlainHighlighter, LessHighlighter
 
 
 ignoredFunctionNames = set([
@@ -244,7 +244,7 @@ class PythonDiffer(Differ):
         if self.isatty:
             self.highlighter = LessHighlighter()
         else:
-            self.highlighter = ColorHighlighter()
+            self.highlighter = PlainHighlighter()
         self.delete_color = self.highlighter.red
         self.insert_color = self.highlighter.green
         self.callNos = callNos
@@ -481,10 +481,10 @@ def main():
         type='string', dest='apitrace', default='apitrace',
         help='apitrace command [default: %default]')
     optparser.add_option(
-        '-d', '--diff',
+        '-d', '--diff', metavar='TOOL',
         type="choice", choices=('diff', 'sdiff', 'wdiff', 'python'),
         dest="diff", default=None,
-        help="diff program: wdiff, sdiff, or diff [default: auto]")
+        help="diff program: diff, sdiff, wdiff, or python [default: auto]")
     optparser.add_option(
         '-c', '--calls', metavar='CALLSET',
         type="string", dest="calls", default='0-10000',