More Unicodification; fixed several more doctests.

1 files changed, 9 insertions, 7 deletions

diff --git a/Mailman/database/model/roster.py b/Mailman/database/model/roster.py
index 0c8c3bd87..55723893d 100644
--- a/Mailman/database/model/roster.py
+++ b/Mailman/database/model/roster.py
@@ -133,12 +133,13 @@ class AdministratorRoster(AbstractRoster):
             yield member
 
     def get_member(self, address):
-        results = Member.query.filter(
-            and_(Member.c.mailing_list == self._mlist.fqdn_listname,
-                 or_(Member.c.role == MemberRole.moderator,
-                     Member.c.role == MemberRole.owner),
-                 Address.c.address == address,
-                 Member.c.address_id == Address.c.id))
+        results = config.db.store.find(
+                Member,
+                Member.mailing_list == self._mlist.fqdn_listname,
+                Or(Member.role == MemberRole.moderator,
+                   Member.role == MemberRole.owner),
+                Address.address == address,
+                Member.address_id == Address.id)
         if results.count() == 0:
             return None
         elif results.count() == 1:
@@ -202,6 +203,7 @@ class Subscribers(AbstractRoster):
 
     @property
     def members(self):
-        for member in Member.query.filter_by(
+        for member in config.db.store.find(
+                Member,
                 mailing_list=self._mlist.fqdn_listname):
             yield member