Two more passing tests.

2 files changed, 6 insertions, 4 deletions

diff --git a/Mailman/database/model/user.py b/Mailman/database/model/user.py
index 2d87b9648..84b5a4595 100644
--- a/Mailman/database/model/user.py
+++ b/Mailman/database/model/user.py
@@ -61,10 +61,10 @@ class User(Model):
 
     def register(self, address, real_name=None):
         # First, see if the address already exists
-        addrobj = Address.get_by(address=address)
+        addrobj = config.db.store.find(Address, address=address).one()
         if addrobj is None:
             if real_name is None:
-                real_name = ''
+                real_name = u''
             addrobj = Address(address=address, real_name=real_name)
             addrobj.preferences = Preferences()
         # Link the address to the user if it is not already linked.
diff --git a/Mailman/database/usermanager.py b/Mailman/database/usermanager.py
index f58e52e68..ab41409d8 100644
--- a/Mailman/database/usermanager.py
+++ b/Mailman/database/usermanager.py
@@ -46,11 +46,13 @@ class UserManager(object):
         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):