Changeset 6588 for main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py

Timestamp:

10 Aug 2011, 21:59:28 (13 years ago)

Author:

Henrik Bettermann

Message:

Undo last changes. Modify invalidate_accesscode function instead. invalidate_accesscode now returns True or False.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py

@@ -460 +460 @@
         batch_id, ac_id = access_code.rsplit('-', 1)
     except ValueError:
-        return False
+        raise ValueError(
+            'Invalid access code format: %s (use: APP-N-XXXXXXXX)' % (
+                access_code,))
     try:
         ac = grok.getSite()['accesscodes'][batch_id].getAccessCode(access_code)
-    except:
-        return False
+    except TypeError:
+        raise KeyError(
+            'No site available for looking up accesscodes')
     info = IWorkflowInfo(ac)
     if toward:
@@ -483 +486 @@
     meanings.
     """
-    return fire_transition(access_code, 'use', comment=comment)
+    try:
+        fire_transition(access_code, 'use', comment=comment)
+        return True
+    except:
+        return False
 
 def disable_accesscode(access_code, comment=None):