pass comparison function (just added for #225) to sort the entries in…

… the rank_combo. closes #232.

bauble/editor.py

@@ -652,7 +652,6 @@ def attach_completion(self, entry,
 
         return completion
 
-    # TODO: add the ability to pass a sort function
     # TODO: add a default value to set in the combo
     def init_translatable_combo(self, combo, translations, default=None,
                                 cmp=None):
@@ -676,6 +675,9 @@ def init_translatable_combo(self, combo, translations, default=None,
         model = gtk.ListStore(object, str)
         if isinstance(translations, dict):
             translations = sorted(translations.iteritems(), key=lambda x: x[1])
+        if cmp is not None:
+            translations = sorted(translations,
+                                  cmp=lambda a, b: cmp(a[0], b[0]))
         for key, value in translations:
             model.append([key, value])
         combo.set_model(model)

bauble/plugins/plants/species_editor.py

@@ -47,7 +47,7 @@
 from bauble.plugins.plants.genus import Genus, GenusSynonym
 from bauble.plugins.plants.species_model import (
     Species, SpeciesDistribution, VernacularName, SpeciesSynonym, Habit,
-    infrasp_rank_values)
+    infrasp_rank_values, compare_rank)
 
 
 class SpeciesEditorPresenter(editor.GenericEditorPresenter):
@@ -419,8 +419,8 @@ def __init__(self, presenter, level):
 
             # rank combo
             self.rank_combo = gtk.ComboBox()
-            self.presenter.view.init_translatable_combo(self.rank_combo,
-                                                        infrasp_rank_values)
+            self.presenter.view.init_translatable_combo(
+                self.rank_combo, infrasp_rank_values, cmp=compare_rank)
             utils.set_widget_value(self.rank_combo, rank)
             presenter.view.connect(self.rank_combo,
                                    'changed', self.on_rank_combo_changed)

bauble/plugins/plants/species_model.py

@@ -84,7 +84,7 @@ def compare_rank(rank1, rank2):
 
     ordering = [u'familia', u'subfamilia', u'tribus', u'subtribus',
                 u'genus', u'subgenus', u'species', u'subsp.',
-                u'var.', u'subvar.', u'f.', u'subf.']
+                u'var.', u'subvar.', u'f.', u'subf.', u'cv.', None]
     return ordering.index(rank1).__cmp__(ordering.index(rank2))