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

Timestamp:

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

Author:

Henrik Bettermann

Message:

Replace 'has_key' by 'in'

File:

• main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/batching.py (modified) (4 diffs)

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

@@ -146 +146 @@
         errs, inv_errs, conv_dict =  converter.fromStringDict(
             row, self.factory_name, mode=mode)
-        if row.has_key('transition') and row.has_key('state'):
+        if 'transition' in row and 'state' in row:
             if row['transition'] not in (IGNORE_MARKER, '') and \
                 row['state'] not in (IGNORE_MARKER, ''):
                 errs.append(('workflow','not allowed'))
                 return errs, inv_errs, conv_dict
-        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, ''):
@@ -188 +188 @@
         # Update state
         # Attention: When importing states the counters remain unchanged.
-        if row.has_key('state'):
+        if 'state' in row:
             state = row.get('state', IGNORE_MARKER)
             if state not in (IGNORE_MARKER, ''):
@@ -198 +198 @@
             row.pop('state')
         # Trigger transition. Counters are properly changed.
-        if row.has_key('transition'):
+        if 'transition' in row:
             transition = row.get('transition', IGNORE_MARKER)
             if transition not in (IGNORE_MARKER, ''):
@@ -209 +209 @@
         # random_num string to avoid annoying automatic number transformation
         # by Excel or Calc
-        if row.has_key('random_num'):
+        if 'random_num' in row:
             random_num = row.get('random_num', IGNORE_MARKER)
             if random_num not in (IGNORE_MARKER, ''):