summaryrefslogtreecommitdiff
path: root/src/mailman/model/user.py
diff options
context:
space:
mode:
authorAbhilash Raj2014-09-13 17:36:16 +0530
committerAbhilash Raj2014-09-13 17:36:16 +0530
commita9b38e7643ac7dd8d526af22a6e3e9ea73933f59 (patch)
tree2a09c32be0745898dbe923d1ebbe87f5a11122b9 /src/mailman/model/user.py
parent4dc18daeaeaf65be50397293b54a9874bfaca228 (diff)
downloadmailman-a9b38e7643ac7dd8d526af22a6e3e9ea73933f59.tar.gz
mailman-a9b38e7643ac7dd8d526af22a6e3e9ea73933f59.tar.zst
mailman-a9b38e7643ac7dd8d526af22a6e3e9ea73933f59.zip
Diffstat (limited to 'src/mailman/model/user.py')
-rw-r--r--src/mailman/model/user.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py
index efe00c6aa..0ba690805 100644
--- a/src/mailman/model/user.py
+++ b/src/mailman/model/user.py
@@ -78,7 +78,7 @@ class User(Model):
super(User, self).__init__()
self._created_on = date_factory.now()
user_id = uid_factory.new_uid()
- assert store.find(User, _user_id=user_id).count() == 0, (
+ assert store.query(User).filter_by(_user_id=user_id).count() == 0, (
'Duplicate user id {0}'.format(user_id))
self._user_id = user_id
self.display_name = ('' if display_name is None else display_name)
@@ -148,7 +148,7 @@ class User(Model):
@dbconnection
def controls(self, store, email):
"""See `IUser`."""
- found = store.find(Address, email=email)
+ found = store.query(Address).filter_by(email=email)
if found.count() == 0:
return False
assert found.count() == 1, 'Unexpected count'
@@ -158,7 +158,7 @@ class User(Model):
def register(self, store, email, display_name=None):
"""See `IUser`."""
# First, see if the address already exists
- address = store.find(Address, email=email).one()
+ address = store.query(Address).filter_by(email=email).first()
if address is None:
if display_name is None:
display_name = ''