Changeset 5447 for main/waeup.sirp/trunk/src/waeup/sirp/jambtables

Timestamp:

16 Aug 2010, 12:32:26 (15 years ago)

Author:

uli

Message:

Move 'get_access_code' to the accesscodes subpackage.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/jambtables

Files:

• authentication.py (modified) (1 diff)
• util.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/jambtables/authentication.py

@@ -38 +38 @@
     IApplicantPrincipalInfo, IApplicantPrincipal, IApplicantSessionCredentials,
     IJAMBApplicantSessionCredentials)
-from waeup.sirp.jambtables.util import get_applicant_data, get_access_code
+from waeup.sirp.jambtables.util import get_applicant_data
+from waeup.sirp.accesscodes import get_access_code
 
 class PortalUser(grok.Role):

main/waeup.sirp/trunk/src/waeup/sirp/jambtables/util.py

@@ -45 +45 @@
     # XXX: Maybe we have to mark reg_no as used here?
     return (applicant_data, entries[0])
-
-def get_access_code(access_code):
-    """Get an access code instance.
-
-    Returns ``None`` if the given code cannot be found.
-
-    XXX: This should be moved to `accesscodes` as public API part.
-    """
-    site = grok.getSite()
-    if not isinstance(access_code, basestring):
-        return None
-    try:
-        batch_id, ac_id = access_code.rsplit('-', 1)
-    except:
-        return None
-    if batch_id not in site['accesscodes'].keys():
-        return None
-    batch = site['accesscodes'][batch_id]
-    return batch.getAccessCode(access_code)