summaryrefslogtreecommitdiff
path: root/src/mailman/model/domain.py
diff options
context:
space:
mode:
authorAbhilash Raj2014-09-06 15:43:47 +0530
committerAbhilash Raj2014-09-06 15:43:47 +0530
commitdb1f5638fe1ab83406a305c3f108c4a1bcfd9cd7 (patch)
treee80b7f649cac12d35fa23383adaceabc43406b8b /src/mailman/model/domain.py
parent46018e4c5624b8cc1b281d97f6df870028adb806 (diff)
downloadmailman-db1f5638fe1ab83406a305c3f108c4a1bcfd9cd7.tar.gz
mailman-db1f5638fe1ab83406a305c3f108c4a1bcfd9cd7.tar.zst
mailman-db1f5638fe1ab83406a305c3f108c4a1bcfd9cd7.zip
Diffstat (limited to 'src/mailman/model/domain.py')
-rw-r--r--src/mailman/model/domain.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mailman/model/domain.py b/src/mailman/model/domain.py
index 2a5391abc..860107b15 100644
--- a/src/mailman/model/domain.py
+++ b/src/mailman/model/domain.py
@@ -142,14 +142,14 @@ class DomainManager:
def remove(self, store, mail_host):
domain = self[mail_host]
notify(DomainDeletingEvent(domain))
- store.remove(domain)
+ store.delete(domain)
notify(DomainDeletedEvent(mail_host))
return domain
@dbconnection
def get(self, store, mail_host, default=None):
"""See `IDomainManager`."""
- domains = store.find(Domain, mail_host=mail_host)
+ domains = store.query(Domain).filter_by(mail_host=mail_host)
if domains.count() < 1:
return default
assert domains.count() == 1, (
@@ -166,15 +166,15 @@ class DomainManager:
@dbconnection
def __len__(self, store):
- return store.find(Domain).count()
+ return store.query(Domain).count()
@dbconnection
def __iter__(self, store):
"""See `IDomainManager`."""
- for domain in store.find(Domain):
+ for domain in store.query(Domain).all():
yield domain
@dbconnection
def __contains__(self, store, mail_host):
"""See `IDomainManager`."""
- return store.find(Domain, mail_host=mail_host).count() > 0
+ return store.query(Domain).filter_by(mail_host=mail_host).count() > 0