diff options
Diffstat (limited to 'Mailman/database')
| -rw-r--r-- | Mailman/database/listmanager.py | 6 | ||||
| -rw-r--r-- | Mailman/database/model/mailinglist.py | 2 | ||||
| -rw-r--r-- | Mailman/database/model/requests.py | 16 |
3 files changed, 16 insertions, 8 deletions
diff --git a/Mailman/database/listmanager.py b/Mailman/database/listmanager.py index 1a17cb96e..cd1f03fe2 100644 --- a/Mailman/database/listmanager.py +++ b/Mailman/database/listmanager.py @@ -49,8 +49,12 @@ class ListManager(object): mlist.delete() def get(self, fqdn_listname): + # Avoid circular imports. + from Mailman.database.model import MailingList listname, hostname = split_listname(fqdn_listname) - mlist = MailingList.get_by(list_name=listname, host_name=hostname) + mlist = config.db.store.find(MailingList, + list_name=listname, + host_name=hostname).one() if mlist is not None: # XXX Fixme mlist._restore() diff --git a/Mailman/database/model/mailinglist.py b/Mailman/database/model/mailinglist.py index ed34a3aae..3a3396758 100644 --- a/Mailman/database/model/mailinglist.py +++ b/Mailman/database/model/mailinglist.py @@ -120,7 +120,7 @@ class MailingList(Model): max_days_to_hold = Int() max_message_size = Int() max_num_recipients = Int() - member_moderation_action = Bool() + member_moderation_action = Enum() member_moderation_notice = Unicode() mime_is_default_digest = Bool() moderator_password = Unicode() diff --git a/Mailman/database/model/requests.py b/Mailman/database/model/requests.py index d16e8f49d..5e92e70b2 100644 --- a/Mailman/database/model/requests.py +++ b/Mailman/database/model/requests.py @@ -47,21 +47,25 @@ class ListRequests: @property def count(self): - return _Request.query.filter_by(mailing_list=self.mailing_list).count() + return config.db.store.find( + _Request, mailing_list=self.mailing_list).count() def count_of(self, request_type): - return _Request.query.filter_by(mailing_list=self.mailing_list, - type=request_type).count() + return config.db.store.find( + _Request, + mailing_list=self.mailing_list, type=request_type).count() @property def held_requests(self): - results = _Request.query.filter_by(mailing_list=self.mailing_list) + results = config.db.store.find( + _Request, mailing_list=self.mailing_list) for request in results: yield request def of_type(self, request_type): - results = _Request.query.filter_by(mailing_list=self.mailing_list, - type=request_type) + results = config.db.store.find( + _Request, + mailing_list=self.mailing_list, type=request_type) for request in results: yield request |