Changeset 7269 for main/waeup.sirp/trunk/src

Timestamp:

4 Dec 2011, 17:41:40 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix test and simplify if statements in batching.py.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• batching.py (modified) (1 diff)
• tests/test_batching.py (modified) (1 diff)

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

@@ -84 +84 @@
 
     def getLocator(self, row):
-        if 'student_id' in row.keys() and row['student_id']:
+        if row.get('student_id',None):
             return 'student_id'
-        elif 'reg_number' in row.keys() and row['reg_number']:
+        elif row.get('reg_number',None):
             return 'reg_number'
-        elif 'matric_number' in row.keys() and row['matric_number']:
+        elif row.get('matric_number',None):
             return 'matric_number'
         else:

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_batching.py

@@ -120 +120 @@
 
     def test_entryExists(self):
-        self.assertFalse(assert self.importer.entryExists(
+        self.assertFalse(self.importer.entryExists(
             dict(student_id='ID_NONE'), self.app))
         student = self.importer.getEntry(