dg-extract-results.py (Named): Remove __cmp__ method.

contrib/
	* dg-extract-results.py (Named): Remove __cmp__ method.
	(output_variation): Use a key to sort variation.harnesses.

From-SVN: r210913

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b2c6cab..90a154e 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-25  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * dg-extract-results.py (Named): Remove __cmp__ method.
+       (output_variation): Use a key to sort variation.harnesses.
+
 2014-05-24  Uros Bizjak  <ubizjak@gmail.com>
 
        * texi2pod.pl: Force .pod file to not be a numbered list.

diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py
index 5b26524..a5dfc5d 100644 (file)
--- a/contrib/dg-extract-results.py
+++ b/contrib/dg-extract-results.py
@@ -11,6 +11,7 @@ import sys
 import getopt
 import re
 from datetime import datetime
+from operator import attrgetter
 
 # True if unrecognised lines should cause a fatal error.  Might want to turn
 # this on by default later.
@@ -24,9 +25,6 @@ class Named:
     def __init__ (self, name):
         self.name = name
 
-    def __cmp__ (self, other):
-        return cmp (self.name, other.name)
-
 class ToolRun (Named):
     def __init__ (self, name):
         Named.__init__ (self, name)
@@ -480,7 +478,8 @@ class Prog:
     # with a summary at the end.
     def output_variation (self, tool, variation):
         self.output_segment (variation.header)
-        for harness in sorted (variation.harnesses.values()):
+        for harness in sorted (variation.harnesses.values(),
+                               key = attrgetter ('name')):
             sys.stdout.write ('Running ' + harness.name + ' ...\n')
             if self.do_sum:
                 # Keep the original test result order if there was only