Index: /main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py	(revision 7917)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py	(revision 7918)
@@ -81,5 +81,6 @@
 
 class SubjectSource(BasicSourceFactory):
-
+    """A source for school subjects used in exam documentation.
+    """
     def getValues(self):
         subjects_dict = getUtility(IKofaUtils).EXAM_SUBJECTS_DICT
@@ -91,13 +92,12 @@
 
 class GradeSource(BasicSourceFactory):
-
+    """A source for exam grades.
+    """
     def getValues(self):
-        grades_dict = getUtility(IKofaUtils).EXAM_GRADES_DICT
-        return [value[0] for value in
-            sorted(grades_dict.items(), key=lambda item: item[1][0])]
+        for entry in getUtility(IKofaUtils).EXAM_GRADES:
+            yield entry[0]
 
     def getTitle(self, value):
-        grades_dict = getUtility(IKofaUtils).EXAM_GRADES_DICT
-        return grades_dict[value][1]
+        return dict(getUtility(IKofaUtils).EXAM_GRADES)[value]
 
 # Define a validation method for email addresses
