Changeset 9701 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

20 Nov 2012, 11:16:38 (12 years ago)

Author:

Henrik Bettermann

Message:

Replace 'has_key' by 'in'

Location:

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

Files:

• batching.py (modified) (6 diffs)
• browser.py (modified) (7 diffs)

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

@@ -148 +148 @@
         # We have to log this if state is provided. If not,
         # logging is done by the event handler handle_student_added
-        if row.has_key('state'):
+        if 'state' in row:
             parent.logger.info('%s - Student record created' % obj.student_id)
         history = IObjectHistory(obj)
@@ -191 +191 @@
 
         # Remove student_id from row if empty
-        if row.has_key('student_id') and row['student_id'] in (
-            None, IGNORE_MARKER):
+        if 'student_id' in row and row['student_id'] in (None, IGNORE_MARKER):
             row.pop('student_id')
 
         # Update password
-        # XXX: Tale DELETION_MARKER into consideration
-        if row.has_key('password'):
+        # XXX: Take DELETION_MARKER into consideration
+        if 'password' in row:
             passwd = row.get('password', IGNORE_MARKER)
             if passwd not in ('', IGNORE_MARKER):
@@ -210 +209 @@
 
         # Update registration state
-        if row.has_key('state'):
+        if 'state' in row:
             state = row.get('state', IGNORE_MARKER)
             if state not in (IGNORE_MARKER, ''):
@@ -221 +220 @@
             row.pop('state')
 
-        if row.has_key('transition'):
+        if 'transition' in row:
             transition = row.get('transition', IGNORE_MARKER)
             if transition not in (IGNORE_MARKER, ''):
@@ -274 +273 @@
         errs, inv_errs, conv_dict =  converter.fromStringDict(
             row, self.factory_name, mode=mode)
-        if row.has_key('transition'):
+        if 'transition' in row:
             if row['transition'] not in IMPORTABLE_TRANSITIONS:
                 if row['transition'] not in (IGNORE_MARKER, ''):
                     errs.append(('transition','not allowed'))
-        if row.has_key('state'):
+        if 'state' in row:
             if row['state'] not in IMPORTABLE_STATES:
                 if row['state'] not in (IGNORE_MARKER, ''):
@@ -438 +437 @@
             StudentStudyCourseProcessor, self).checkConversion(row, mode=mode)
         # We have to check if current_level is in range of certificate.
-        if conv_dict.has_key('certificate') and \
-            conv_dict.has_key('current_level'):
+        if 'certificate' in conv_dict and 'current_level' in conv_dict:
             cert = conv_dict['certificate']
             level = conv_dict['current_level']

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

@@ -528 +528 @@
     def save(self, **data):
         form = self.request.form
-        if form.has_key('transition') and form['transition']:
+        if 'transition' in form and form['transition']:
             transition_id = form['transition']
             wf_info = IWorkflowInfo(self.context)
@@ -957 +957 @@
     def delStudyLevels(self, **data):
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else:
@@ -1153 +1153 @@
     def delCourseTicket(self, **data):
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else:
@@ -1353 +1353 @@
     def delPaymentTicket(self, **data):
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else:
@@ -1406 +1406 @@
         if 'maintenance' in p_category:
             current_session = str(student['studycourse'].current_session)
-            if not student['accommodation'].has_key(current_session):
+            if not current_session in student['accommodation']:
                 self.flash(_('You have not yet booked accommodation.'))
                 self.redirect(self.url(self.context))
@@ -1559 +1559 @@
             return
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else:
@@ -2216 +2216 @@
     def _delCourseTicket(self, **data):
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else: