1 files changed, 20 insertions, 14 deletions
diff --git a/Mailman/database/model/member.py b/Mailman/database/model/member.py
index 4f353a06c..3f9775d3c 100644
--- a/Mailman/database/model/member.py
+++ b/Mailman/database/model/member.py
@@ -15,28 +15,34 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
-from elixir import *
+from storm.locals import *
 from zope.interface import implements
 
 from Mailman.Utils import split_listname
+from Mailman.configuration import config
 from Mailman.constants import SystemDefaultPreferences
-from Mailman.database.types import EnumType
+from Mailman.database import Model
+from Mailman.database.types import Enum
 from Mailman.interfaces import IMember, IPreferences
 
 
-ADDRESS_KIND    = 'Mailman.database.model.address.Address'
-PREFERENCE_KIND = 'Mailman.database.model.preferences.Preferences'
-
-
 
-class Member(Entity):
+class Member(Model):
     implements(IMember)
 
-    role = Field(EnumType)
-    mailing_list = Field(Unicode)
-    # Relationships
-    address = ManyToOne(ADDRESS_KIND)
-    preferences = ManyToOne(PREFERENCE_KIND)
+    id = Int(primary=True)
+    role = Enum()
+    mailing_list = Unicode()
+
+    address_id = Int()
+    address = Reference(address_id, 'Address.id')
+    preferences_id = Int()
+    preferences = Reference(preferences_id, 'Preferences.id')
+
+    def __init__(self, role, mailing_list, address):
+        self.role = role
+        self.mailing_list = mailing_list
+        self.address = address
 
     def __repr__(self):
         return '<Member: %s on %s as %s>' % (
@@ -85,5 +91,5 @@ class Member(Entity):
         return 'http://example.com/' + self.address.address
 
     def unsubscribe(self):
-        self.preferences.delete()
-        self.delete()
+        config.db.store.remove(self.preferences)
+        config.db.store.remove(self)