Fix traceback if an order attribute is None

Fixes issue2551207.

Author: schlatterbeck

CHANGES.txt

@@ -97,6 +97,8 @@ Fixed:
 - new option added to config.ini: login_empty_passwords set to
   no by default. Setting this to yes allows a user with an
   empty password to login.
+- issue2551207 - Fix sorting by order attribute if order attributes can
+  be None. Add a test.
 
 Features:
 

roundup/cgi/templating.py

@@ -2883,6 +2883,9 @@ def make_key_function(db, classname, sort_on=None):
     def keyfunc(a):
         if num_re.match(a):
             a = linkcl.get(a, sort_on)
+            # In Python3 we may not compare strings and None
+            if a is None :
+                return ''
         return a
     return keyfunc
 

test/test_templating.py

@@ -108,6 +108,21 @@ def test_HTMLDatabase_classes(self):
         db._db.classes = {'issue':MockNull(), 'user': MockNull()}
         db.classes()
 
+    def test_HTMLDatabase_list(self):
+        # The list method used to produce a traceback when a None value
+        # for an order attribute of a class was encountered. This
+        # happens when the 'get' of the order attribute for a numeric
+        # id produced a None value. So we put '23' as a key into the
+        # list and set things up that a None value is returned on 'get'.
+
+        # This keeps db.issue static, otherwise it changes for each call
+        db = MockNull(issue = HTMLDatabase(self.client).issue)
+        db.issue._klass.list = lambda : ['23', 'a', 'b']
+        # Make db.getclass return something that has a sensible 'get' method
+        mock = MockNull(get = lambda x, y : None)
+        db.issue._db.getclass = lambda x : mock
+        l = db.issue.list()
+
 class FunctionsTestCase(TemplatingTestCase):
     def test_lookupIds(self):
         db = HTMLDatabase(self.client)