Convert to the Storm Python ORM <storm.canonical.com>. There were several

reasons for this, but most importantly, the changes from SQLAlchemy/Elixir 0.3
to 0.4 were substantial and caused a lot of work.  This work unfortunately did
not result in a working branch due to very strange and inconsistent behavior
with Unicode columns.  Sometimes such columns would return Unicode, sometimes
8-bit strings, with no rhyme or reason.  I gave up debugging this after many
hours of head scratching.

Oh yeah, no more flush!

Storm enforces Unicode columns, which is very nice, though requires us to add
lots of 'u's in places we didn't have them before.  Ultimately, this is a good
thing so that the core of Mailman will be Unicode consistent.

One thing I still want to clean up after this, is the function-scoped imports
in the model code.  Part of the reason for the separate model classes was to
avoid this, but for now, we'll live with it.  Storm's architecture requires us
to maintain a database-table-class registry for simple clearing after tests
in Database._reset().  This is made fairly simple by Storm allowing us to use
our own metaclass for model classes.

Storm does require that we write our own SQL files, which is a downside, but I
think our schema will be easy enough that this won't be a huge burden.  Plus
we have a head-start <wink>.

Another cool thing about Storm is the explicit use of stores for objects.
This should eventually allow me to flesh out my idea of storage pillars for 1)
lists, 2) users, 3) messages.

Some other changes:

- pylint and pyflakes cleanups
- SQLALCHEMY_ENGINE_URL -> DEFAULT_DATABASE_URL
- Don't import-* from Version in Defaults.py
- Add interface method to Mailman.Message.Message so that __getitem__() and
  get_all() always return Unicode headers, even when the underlying objects
  are strings.  This should generally be safe as headers are required by RFC
  to be within the ASCII range.
- Fix bin/arch.py to use proper initialization.

1 files changed, 24 insertions, 12 deletions

diff --git a/Mailman/database/usermanager.py b/Mailman/database/usermanager.py
index 6bc2ed53d..ab41409d8 100644
--- a/Mailman/database/usermanager.py
+++ b/Mailman/database/usermanager.py
@@ -15,18 +15,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
-"""SQLAlchemy/Elixir based provider of IUserManager."""
+"""A user manager."""
 
 from __future__ import with_statement
 
 import os
 
-from elixir import *
 from zope.interface import implements
 
 from Mailman import Errors
 from Mailman.configuration import config
-from Mailman.database.model import *
 from Mailman.interfaces import IUserManager
 
 
@@ -35,25 +33,32 @@ class UserManager(object):
     implements(IUserManager)
 
     def create_user(self, address=None, real_name=None):
+        # Avoid circular imports.
+        from Mailman.database.model import Address, Preferences, User
         user = User()
-        user.real_name = ('' if real_name is None else real_name)
+        user.real_name = (u'' if real_name is None else real_name)
         if address:
             addrobj = Address(address, user.real_name)
             addrobj.preferences = Preferences()
             user.link(addrobj)
         user.preferences = Preferences()
+        config.db.store.add(user)
         return user
 
     def delete_user(self, user):
-        user.delete()
+        config.db.store.remove(user)
 
     @property
     def users(self):
-        for user in User.query.filter_by().all():
+        # Avoid circular imports.
+        from Mailman.database.model import User
+        for user in config.db.store.find(User):
             yield user
 
     def get_user(self, address):
-        addresses = Address.query.filter_by(address=address.lower())
+        # Avoid circular imports.
+        from Mailman.database.model import Address
+        addresses = config.db.store.find(Address, address=address.lower())
         if addresses.count() == 0:
             return None
         elif addresses.count() == 1:
@@ -62,17 +67,20 @@ class UserManager(object):
             raise AssertionError('Unexpected query count')
 
     def create_address(self, address, real_name=None):
-        addresses = Address.query.filter_by(address=address.lower())
+        # Avoid circular imports.
+        from Mailman.database.model import Address, Preferences
+        addresses = config.db.store.find(Address, address=address.lower())
         if addresses.count() == 1:
             found = addresses[0]
             raise Errors.ExistingAddressError(found.original_address)
         assert addresses.count() == 0, 'Unexpected results'
         if real_name is None:
-            real_name = ''
+            real_name = u''
         # It's okay not to lower case the 'address' argument because the
         # constructor will do the right thing.
         address = Address(address, real_name)
         address.preferences = Preferences()
+        config.db.store.add(address)
         return address
 
     def delete_address(self, address):
@@ -80,10 +88,12 @@ class UserManager(object):
         # unlinked before the address can be deleted.
         if address.user:
             address.user.unlink(address)
-        address.delete()
+        config.db.store.remove(address)
 
     def get_address(self, address):
-        addresses = Address.query.filter_by(address=address.lower())
+        # Avoid circular imports.
+        from Mailman.database.model import Address
+        addresses = config.db.store.find(Address, address=address.lower())
         if addresses.count() == 0:
             return None
         elif addresses.count() == 1:
@@ -93,5 +103,7 @@ class UserManager(object):
 
     @property
     def addresses(self):
-        for address in Address.query.filter_by().all():
+        # Avoid circular imports.
+        from Mailman.database.model.address import Address
+        for address in config.db.store.find(Address):
             yield address