diff options
| author | Aurélien Bompard | 2016-04-28 17:34:52 +0200 |
|---|---|---|
| committer | Barry Warsaw | 2016-05-04 21:05:49 -0500 |
| commit | 8467bb95c9dade901f7c96a5a3adf4d399618a6b (patch) | |
| tree | 76c1754a1f896eb29eb61907584a362cc1a25423 /src/mailman/model/user.py | |
| parent | bbee322577cb7cf30e9987ee79bd0a5775546375 (diff) | |
| download | mailman-8467bb95c9dade901f7c96a5a3adf4d399618a6b.tar.gz mailman-8467bb95c9dade901f7c96a5a3adf4d399618a6b.tar.zst mailman-8467bb95c9dade901f7c96a5a3adf4d399618a6b.zip | |
Diffstat (limited to 'src/mailman/model/user.py')
| -rw-r--r-- | src/mailman/model/user.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py index fe4f1c6d4..a7d3f2353 100644 --- a/src/mailman/model/user.py +++ b/src/mailman/model/user.py @@ -31,8 +31,8 @@ from mailman.model.preferences import Preferences from mailman.model.roster import Memberships from mailman.utilities.datetime import factory as date_factory from mailman.utilities.uid import UIDFactory -from sqlalchemy import not_ -from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, Unicode +from sqlalchemy import ( + Boolean, Column, DateTime, ForeignKey, Integer, Unicode) from sqlalchemy.orm import backref, relationship from zope.event import notify from zope.interface import implementer @@ -181,7 +181,7 @@ class User(Model): """See `IUser`.""" assert user is not None if user.id == self.id: - return # Protect against absorbing oneself. + return # Protect against absorbing oneself. # Relink addresses. for address in list(user.addresses): # convert to list because we'll mutate the result @@ -189,7 +189,7 @@ class User(Model): # Merge memberships. other_members = store.query(Member).filter( Member.user_id == user.id) - subscribed_lists = [ m.list_id for m in self.memberships.members ] + subscribed_lists = [m.list_id for m in self.memberships.members] for member in other_members: # Only import memberships of lists I'm not subscribed to yet, # delete the rest. |
