Author: chrisz
Date: Mon Jan 28 12:56:29 2008
New Revision: 4065
URL: http://trac.turbogears.org/changeset/4065

Log:
The widget list was not sorted alphabetically (CSS came before Calendar).

Modified:
   branches/1.0/turbogears/toolbox/base.py
   branches/1.1/turbogears/toolbox/base.py

Modified: branches/1.0/turbogears/toolbox/base.py
==============================================================================
--- branches/1.0/turbogears/toolbox/base.py     (original)
+++ branches/1.0/turbogears/toolbox/base.py     Mon Jan 28 12:56:29 2008
@@ -54,9 +54,9 @@
                 all_descs[wd.full_class_name.replace(".", "_")] = wd
             self.all_descs = all_descs
         if name:
-            all_descs = {name : all_descs[name]}
-        desclist = list(all_descs.values())
-        desclist.sort(cmp=lambda x,y: cmp(x.name, y.name))
+            all_descs = {name: all_descs[name]}
+        desclist = all_descs.values()
+        desclist.sort(cmp=lambda x,y: cmp(x.name.lower(), y.name.lower()))
         output = dict(descs=desclist, viewing_one=name != None)
         if name:
             # do not extend desclist!

Modified: branches/1.1/turbogears/toolbox/base.py
==============================================================================
--- branches/1.1/turbogears/toolbox/base.py     (original)
+++ branches/1.1/turbogears/toolbox/base.py     Mon Jan 28 12:56:29 2008
@@ -54,9 +54,8 @@
                 all_descs[wd.full_class_name.replace(".", "_")] = wd
             self.all_descs = all_descs
         if name:
-            all_descs = {name : all_descs[name]}
-        desclist = list(all_descs.values())
-        desclist.sort(cmp=lambda x,y: cmp(x.name, y.name))
+            all_descs = {name: all_descs[name]}
+        desclist = sorted(all_descs.itervalues(), key=lambda x: x.name.lower())
         output = dict(descs=desclist, viewing_one=name != None)
         if name:
             # do not extend desclist!

Reply via email to