Much progress, though not perfect, on migrating to SQLAlchemy 0.4 and Elixir

0.4.  Lots of things changes, which broke lots of our code.  There are still a
couple of failures in the test suite that I don't understand.  It seems that
for pending.txt and requests.txt, sometimes strings come back from the
database as 8-bit strings and other times as unicodes.  It's impossible to
make these tests work both separately and together.

users.txt is also failing intermittently.  Lots of different behavior between
running the full test suite all together and running individual tests.  Sigh.

Note also that actually, Elixir 0.4.0 doesn't work for us.  There's a bug in
that version that prevented zope.interfaces and Elixir working together.  Get
the latest 0.4.0 from source to fix this.

Other changes include:

- Remove Mailman/lockfile.py.  While I haven't totally eliminated locking, I
  have released the lockfile as a separate Python package called locknix,
  which Mailman 3.0 now depends on.

- Renamed Mailman/interfaces/messagestore.py and added an IMessage interface.

- bin/testall raises turns on SQLALCHEMY_ECHO when the verbosity is above 3
  (that's three -v's because the default verbosity is 1).

- add_domain() in config files now allows url_host to be optional.  If not
  given, it defaults to email_host.

- Added a non-public interface IDatabase._reset() used by the test suite to
  zap the database between doctests.  Added an implementation in the model
  which just runs through all rows in all entities, deleting them.

- [I]Pending renamed to [I]Pended

- Don't allow Pendings.add() to infloop.

- In the model's User impelementations, we don't need to append or remove the
  address when linking and unlinking.  By setting the address.user attribute,
  SQLAlchemy appears to do the right thing, though I'm not 100% sure of that
  (see the above mentioned failures).

1 files changed, 21 insertions, 17 deletions

diff --git a/Mailman/database/model/roster.py b/Mailman/database/model/roster.py
index e59bc8b17..c8fa86d58 100644
--- a/Mailman/database/model/roster.py
+++ b/Mailman/database/model/roster.py
@@ -49,8 +49,9 @@ class AbstractRoster(object):
 
     @property
     def members(self):
-        for member in Member.select_by(mailing_list=self._mlist.fqdn_listname,
-                                       role=self.role):
+        for member in Member.query.filter_by(
+                mailing_list=self._mlist.fqdn_listname,
+                role=self.role):
             yield member
 
     @property
@@ -72,18 +73,18 @@ class AbstractRoster(object):
             yield member.address
 
     def get_member(self, address):
-        results = Member.select(
+        results = Member.query.filter(
             and_(Member.c.mailing_list == self._mlist.fqdn_listname,
                  Member.c.role == self.role,
                  Address.c.address == address,
                  Member.c.address_id == Address.c.id))
-        if len(results) == 0:
+        if results.count() == 0:
             return None
-        elif len(results) == 1:
+        elif results.count() == 1:
             return results[0]
         else:
-            assert len(results) <= 1, (
-                'Too many matching member results: %s' % results)
+            raise AssertionError('Too many matching member results: %s' %
+                                 results.count())
 
 
 
@@ -120,7 +121,7 @@ class AdministratorRoster(AbstractRoster):
     def members(self):
         # Administrators are defined as the union of the owners and the
         # moderators.
-        members = Member.select(
+        members = Member.query.filter(
             and_(Member.c.mailing_list == self._mlist.fqdn_listname,
                  or_(Member.c.role == MemberRole.owner,
                      Member.c.role == MemberRole.moderator)))
@@ -128,18 +129,18 @@ class AdministratorRoster(AbstractRoster):
             yield member
 
     def get_member(self, address):
-        results = Member.select(
+        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))
-        if len(results) == 0:
+        if results.count() == 0:
             return None
-        elif len(results) == 1:
+        elif results.count() == 1:
             return results[0]
         else:
-            assert len(results) <= 1, (
+            raise AssertionError(
                 'Too many matching member results: %s' % results)
 
 
@@ -154,8 +155,9 @@ class RegularMemberRoster(AbstractRoster):
         # Query for all the Members which have a role of MemberRole.member and
         # are subscribed to this mailing list.  Then return only those members
         # that have a regular delivery mode.
-        for member in Member.select_by(mailing_list=self._mlist.fqdn_listname,
-                                       role=MemberRole.member):
+        for member in Member.query.filter_by(
+                mailing_list=self._mlist.fqdn_listname,
+                role=MemberRole.member):
             if member.delivery_mode == DeliveryMode.regular:
                 yield member
 
@@ -179,8 +181,9 @@ class DigestMemberRoster(AbstractRoster):
         # Query for all the Members which have a role of MemberRole.member and
         # are subscribed to this mailing list.  Then return only those members
         # that have one of the digest delivery modes.
-        for member in Member.select_by(mailing_list=self._mlist.fqdn_listname,
-                                       role=MemberRole.member):
+        for member in Member.query.filter_by(
+                mailing_list=self._mlist.fqdn_listname,
+                role=MemberRole.member):
             if member.delivery_mode in _digest_modes:
                 yield member
 
@@ -193,5 +196,6 @@ class Subscribers(AbstractRoster):
 
     @property
     def members(self):
-        for member in Member.select_by(mailing_list=self._mlist.fqdn_listname):
+        for member in Member.query.filter_by(
+                mailing_list=self._mlist.fqdn_listname):
             yield member