diff options
| -rw-r--r-- | src/mailman/model/mailinglist.py | 1 | ||||
| -rw-r--r-- | src/mailman/model/uid.py | 2 | ||||
| -rw-r--r-- | src/mailman/model/user.py | 6 | ||||
| -rw-r--r-- | src/mailman/model/usermanager.py | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py index abbf370e8..b1997ef95 100644 --- a/src/mailman/model/mailinglist.py +++ b/src/mailman/model/mailinglist.py @@ -500,7 +500,6 @@ class AcceptableAlias(Model): mailing_list_id = Column(Integer) mailing_list = relationship('MailingList') - #mailing_list = Reference(mailing_list_id, MailingList.id) alias = Column(Unicode) diff --git a/src/mailman/model/uid.py b/src/mailman/model/uid.py index cb248b1fa..6486089fa 100644 --- a/src/mailman/model/uid.py +++ b/src/mailman/model/uid.py @@ -74,7 +74,7 @@ class UID(Model): :type uid: unicode :raises ValueError: if the id is not unique. """ - existing = store.find(UID, uid=uid) + existing = store.query(UID).filter_by(uid=uid) if existing.count() != 0: raise ValueError(uid) return UID(uid) 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 = '' diff --git a/src/mailman/model/usermanager.py b/src/mailman/model/usermanager.py index a5ee40ae8..d03ece6ee 100644 --- a/src/mailman/model/usermanager.py +++ b/src/mailman/model/usermanager.py @@ -80,7 +80,7 @@ class UserManager: @dbconnection def create_address(self, store, email, display_name=None): """See `IUserManager`.""" - addresses = store.query(Address).filter_by(email=email.lower()) + addresses = store.query(Address).filter(Address.email==email.lower()) if addresses.count() == 1: found = addresses[0] raise ExistingAddressError(found.original_email) |