--- a/app/soc/models/linkable.py	Sat Nov 22 22:30:32 2008 +0000
+++ b/app/soc/models/linkable.py	Sat Nov 22 22:44:02 2008 +0000
@@ -23,12 +23,12 @@
 
 import re
 
-import polymodel
-
 from google.appengine.ext import db
 
 from django.utils.translation import ugettext_lazy
 
+from soc.models import base
+
 
 # start with ASCII digit or lowercase
 #   (additional ASCII digit or lowercase
@@ -66,7 +66,7 @@
 PATH_LINK_ID_REGEX = re.compile(PATH_LINK_ID_PATTERN)
 
 
-class Linkable(polymodel.PolyModel):
+class Linkable(base.ModelWithFieldAttributes):
   """A base class for Model classes that are "linkable".
   
   Many entities in Melange are identified by a "link path" that is formed