diff options
Diffstat (limited to 'Mailman/database/model/pending.py')
| -rw-r--r-- | Mailman/database/model/pending.py | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/Mailman/database/model/pending.py b/Mailman/database/model/pending.py index be180d7f2..3f3e2caa0 100644 --- a/Mailman/database/model/pending.py +++ b/Mailman/database/model/pending.py @@ -17,6 +17,7 @@ """Implementations of the IPendable and IPending interfaces.""" +import sys import time import random import hashlib @@ -29,7 +30,7 @@ from zope.interface.verify import verifyObject from Mailman.configuration import config from Mailman.database import Model from Mailman.interfaces import ( - IPendings, IPendable, IPendedKeyValue, IPended) + IPendable, IPended, IPendedKeyValue, IPendings) @@ -45,6 +46,7 @@ class PendedKeyValue(Model): id = Int(primary=True) key = Unicode() value = Unicode() + pended_id = Int() class Pended(Model): @@ -59,7 +61,7 @@ class Pended(Model): id = Int(primary=True) token = RawStr() expiration_date = DateTime() - key_values = ReferenceSet(id, PendedKeyValue.id) + key_values = ReferenceSet(id, PendedKeyValue.pended_id) @@ -104,13 +106,20 @@ class Pendings(object): key = unicode(key, 'utf-8') if isinstance(value, str): value = unicode(value, 'utf-8') + elif type(value) is int: + value = u'__builtin__.int\1%s' % value + elif type(value) is float: + value = u'__builtin__.float\1%s' % value + elif type(value) is bool: + value = u'__builtin__.bool\1%s' % value keyval = PendedKeyValue(key=key, value=value) pending.key_values.add(keyval) config.db.store.add(pending) return token def confirm(self, token, expunge=True): - pendings = config.db.store.find(Pended, token=token) + store = config.db.store + pendings = store.find(Pended, token=token) if pendings.count() == 0: return None assert pendings.count() == 1, ( @@ -118,27 +127,32 @@ class Pendings(object): pending = pendings[0] pendable = UnpendedPendable() # Find all PendedKeyValue entries that are associated with the pending - # object's ID. - q = PendedKeyValue.query.filter( - PendedKeyValue.c.pended_id == Pended.c.id).filter( - Pended.c.id == pending.id) - for keyvalue in q.all(): - pendable[keyvalue.key] = keyvalue.value + # object's ID. Watch out for type conversions. + for keyvalue in store.find(PendedKeyValue, + PendedKeyValue.pended_id == pending.id): + if keyvalue.value is not None and '\1' in keyvalue.value: + typename, value = keyvalue.value.split('\1', 1) + package, classname = typename.rsplit('.', 1) + __import__(package) + module = sys.modules[package] + pendable[keyvalue.key] = getattr(module, classname)(value) + else: + pendable[keyvalue.key] = keyvalue.value if expunge: - keyvalue.delete() + store.remove(keyvalue) if expunge: - pending.delete() + store.remove(pending) return pendable def evict(self): + store = config.db.store now = datetime.datetime.now() - for pending in Pended.query.filter_by().all(): + for pending in store.find(Pended): if pending.expiration_date < now: # Find all PendedKeyValue entries that are associated with the # pending object's ID. - q = PendedKeyValue.query.filter( - PendedKeyValue.c.pended_id == Pended.c.id).filter( - Pended.c.id == pending.id) + q = store.find(PendedKeyValue, + PendedKeyValue.pended_id == pending.id) for keyvalue in q: - keyvalue.delete() - pending.delete() + store.remove(keyvalue) + store.remove(pending) |