Ticket #1038: milestone_sort_dsu.2.diff

trac/ticket/model.py

@@ -22 +22 @@
 
 from trac.core import TracError
 from trac.ticket import TicketSystem
-from trac.util import natural_order
+from trac.util import sorted, embedded_numbers
 
 __all__ = ['Ticket', 'Type', 'Status', 'Resolution', 'Priority', 'Severity',
            'Component', 'Milestone', 'Version']
@@ -628 +628 @@
             milestone.completed = completed and int(completed) or 0
             milestone.description = description or ''
             milestones.append(milestone)
-        milestones.sort(lambda a, b:
-                        cmp(a.completed or sys.maxint,
-                            b.completed or sys.maxint) or \
-                        cmp(a.due or sys.maxint,
-                            b.due or sys.maxint) or \
-                        natural_order(a.name, b.name))
-        return milestones
+        def milestone_order(m):
+            return (m.completed or sys.maxint,
+                    m.due or sys.maxint,
+                    embedded_numbers(m.name))
+        return sorted(milestones, key=milestone_order)
+                                       
     select = classmethod(select)
 
 

trac/versioncontrol/web_ui/browser.py

@@ -142 +142 @@
             elif order == 'size':
                 return neg * cmp(a['content_length'], b['content_length'])
             else:
-                return neg * util.natural_order(a['name'].lower(),
-                                                b['name'].lower())
+                return neg * cmp(util.embedded_numbers(a['name'].lower()),
+                                 util.embedded_numbers(b['name'].lower()))
         info.sort(cmp_func)
 
         req.hdf['browser.items'] = info

trac/util.py

@@ -3 +3 @@
 # Copyright (C) 2003-2006 Edgewall Software
 # Copyright (C) 2003-2004 Jonas Borgstr�jonas@edgewall.com>
 # Copyright (C) 2005-2006 Christian Boos <cboos@neuf.fr>
+# Copyright (C) 2006 Matthew Good <trac@matt-good.net>
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
@@ -14 +15 @@
 # history and logs, available at http://projects.edgewall.com/trac/.
 #
 # Author: Jonas Borgstr�jonas@edgewall.com>
+#         Matthew Good <trac@matt-good.net>
 
 import cgi
 import md5
@@ -261 +263 @@
             shortline = text[:i]+' ...'
     return shortline
 
-DIGITS = re.compile(r'[0-9]+')
-def natural_order(x, y):
+
+try:
+    sorted = sorted
+except NameError:
+    def sorted(iterable, key):
+        """Partial implementation of the "sorted" function from Python 2.4"""
+        lst = [(key(i), i) for i in iterable]
+        lst.sort()
+        return [i for __, i in lst]
+
+DIGITS = re.compile(r'(\d+)')
+def embedded_numbers(s):
     """Comparison function for natural order sorting based on
     http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/214202."""
-    nx = ny = 0
-    while True:
-        a = DIGITS.search(x, nx)
-        b = DIGITS.search(y, ny)
-        if None in (a, b):
-            return cmp(x[nx:], y[ny:])
-        r = (cmp(x[nx:a.start()], y[ny:b.start()]) or
-             cmp(int(x[a.start():a.end()]), int(y[b.start():b.end()])))
-        if r:
-            return r
-        nx, ny = a.end(), b.end()
+    pieces = DIGITS.split(s)
+    pieces[1::2] = map(int, pieces[1::2])
+    return pieces
 
 def hex_entropy(bytes=32):
     import md5