Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/batching.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/batching.py	(revision 6853)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/batching.py	(revision 6854)
@@ -46,7 +46,9 @@
 
     def checkHeaders(self, headerfields, mode='create'):
-        if not 'reg_number' in headerfields and not 'student_id' in headerfields and not 'matric_number' in headerfields:
-            raise FatalCSVError(
-                "Need at least columns student_id or reg_number or matric_number for import!")
+        if not 'reg_number' in headerfields and not 'student_id' \
+            in headerfields and not 'matric_number' in headerfields:
+            raise FatalCSVError(
+                "Need at least columns student_id or reg_number " +
+                "or matric_number for import!")
         if mode == 'create':
             for field in self.required_fields:
@@ -125,5 +127,6 @@
         raw_header = reader.next()
         for num, field in enumerate(headerfields):
-            if field not in ['student_id', 'reg_number', 'matric_number'] and mode == 'remove':
+            if field not in [
+                'student_id', 'reg_number', 'matric_number'] and mode == 'remove':
                 continue
             if field == u'--IGNORE--':
@@ -173,7 +176,9 @@
 
     def checkHeaders(self, headerfields, mode='ignore'):
-        if not 'reg_number' in headerfields and not 'student_id' in headerfields and not 'matric_number' in headerfields:
-            raise FatalCSVError(
-                "Need at least columns student_id or reg_number or matric_number for import!")
+        if not 'reg_number' in headerfields and not 'student_id' \
+            in headerfields and not 'matric_number' in headerfields:
+            raise FatalCSVError(
+                "Need at least columns student_id " +
+                "or reg_number or matric_number for import!")
         # Check for fields to be ignored...
         not_ignored_fields = [x for x in headerfields
