Changeset 14337 for main/waeup.kofa/trunk/src/waeup

Timestamp:

12 Dec 2016, 17:38:18 (8 years ago)

Author:

Henrik Bettermann

Message:

Catch KeyError?.

Fix level report and adjust test.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• batching.py (modified) (1 diff)
• reports/level_report.py (modified) (1 diff)
• reports/tests/test_level_report.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -585 +585 @@
         if studycourse is None:
             return None
-        return studycourse.get(str(row['level']))
+        try:
+            entry = studycourse.get(str(row['level']))
+        except KeyError:
+            return None
+        return entry
 
     def delEntry(self, row, site):

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py

@@ -62 +62 @@
         # This is a very special column requested by AAUE, Nigeria.
         # The 'remark' column remains empty in base package.
-        remark = getattr(level_obj, 'remark', None)
+        remark = getattr(level_obj, 'remark', '')
         line = (
                 #stud.student_id,

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_level_report.py

@@ -42 +42 @@
         self.assertEqual(result,
             [(u'1234', u'Bob Tester', 90, 30, 1.667, 'm_Course2_m Course3',
-              90, 30, 1.667, None)])
+              90, 30, 1.667, '')])
         return