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

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/applicants

Files:

• batching.py (modified) (5 diffs)
• browser.py (modified) (4 diffs)

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

@@ -226 +226 @@
         items_changed = ''
         # Remove application_number from row if empty
-        if row.has_key('application_number') and row['application_number'] in (
+        if 'application_number' in row and row['application_number'] in (
             None, IGNORE_MARKER):
             row.pop('application_number')
@@ -232 +232 @@
         # Update applicant_id fom application_number and container code
         # if application_number is given
-        if row.has_key('application_number'):
+        if 'application_number' in row:
             obj.applicant_id = u'%s_%s' % (
                 row['container_code'], row['application_number'])
@@ -239 +239 @@
 
         # Update password
-        if row.has_key('password'):
+        if 'password' in row:
             passwd = row.get('password', IGNORE_MARKER)
             if passwd not in ('', IGNORE_MARKER):
@@ -252 +252 @@
 
         # Update registration state
-        if row.has_key('state'):
+        if 'state' in row:
             state = row.get('state', IGNORE_MARKER)
             if state not in (IGNORE_MARKER, ''):
@@ -306 +306 @@
             if cert.application_category != parent.application_category:
                 errs.append(('course1', 'wrong application category'))
-        if row.has_key('state') and \
+        if 'state' in row and \
             not row['state'] in IMPORTABLE_STATES:
             if row['state'] not in (IGNORE_MARKER, ''):

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

@@ -169 +169 @@
     def delApplicantsContainers(self, **data):
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else:
@@ -417 +417 @@
     def delApplicant(self, **data):
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else:
@@ -442 +442 @@
     def createStudents(self, **data):
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else:
@@ -849 +849 @@
     def delPaymentTickets(self, **data):
         form = self.request.form
-        if form.has_key('val_id'):
+        if 'val_id' in form:
             child_id = form['val_id']
         else: