issue2551250: Fix sorting of detectors

.. even if there are two with the same name and priority (can happen if
they are created in two different files).

Author: schlatterbeck

CHANGES.txt

@@ -58,6 +58,9 @@ Fixed:
 - Fix final exception handler in roundup-server to send proper
   Content-Length header to the client. (John Rouillard)
 - Fix traceback if Origin header is missing. (John Rouillard)
+- issue2551250: Fix sorting of detectors even if there are two with the
+  same name and priority (can happen if they are created in two
+  different files).
 
 Features:
 

roundup/hyperdb.py

@@ -1183,8 +1183,9 @@ def __init__(self, db, classname, **properties):
         db.addclass(self)
 
         actions = "create set retire restore".split()
-        self.auditors = dict([(a, PrioList()) for a in actions])
-        self.reactors = dict([(a, PrioList()) for a in actions])
+        skey = lambda x: x[:2]
+        self.auditors = dict([(a, PrioList(key=skey)) for a in actions])
+        self.reactors = dict([(a, PrioList(key=skey)) for a in actions])
 
     def __repr__(self):
         """Slightly more useful representation

roundup/support.py

@@ -41,16 +41,17 @@ class PrioList:
     ...  p.append(i)
     ...
     >>> for k in p:
-    ...  print k
+    ...  print (k)
     ...
     -1
     1
     5
     7
 
     '''
-    def __init__(self):
+    def __init__(self, key=None):
         self.list = []
+        self.key = key
         self.sorted = True
 
     def append(self, item):
@@ -59,7 +60,7 @@ def append(self, item):
 
     def __iter__(self):
         if not self.sorted:
-            self.list.sort()
+            self.list.sort(key=self.key)
             self.sorted = True
         return iter(self.list)