Moved default class import markers to base model.

evennia/comms/comms.py

@@ -18,8 +18,6 @@ class DefaultChannel(ChannelDB):
     """
     # typeclass setup
     __metaclass__ = TypeclassBase
-    __settingclasspath__ = settings.BASE_CHANNEL_TYPECLASS
-    __defaultclasspath__ = "evennia.comms.comms.DefaultChannel"
     objects = ChannelManager()
 
     def at_first_save(self):

evennia/comms/models.py

@@ -469,8 +469,8 @@ class ChannelDB(TypedObject):
     # Database manager
     objects = managers.ChannelDBManager()
 
-    _typeclass_paths = settings.CHANNEL_TYPECLASS_PATHS
+    __settingclasspath__ = settings.BASE_CHANNEL_TYPECLASS
-    _default_typeclass_path = settings.BASE_CHANNEL_TYPECLASS or "evennia.comms.comms.Channel"
+    __defaultclasspath__ = "evennia.comms.comms.DefaultChannel"
 
     class Meta:
         "Define Django meta options"

evennia/objects/models.py

@@ -14,6 +14,7 @@ the database object. Like everything else, they can be accessed
 transparently through the decorating TypeClass.
 """
 
+from django.conf import settings
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
 
@@ -178,6 +179,10 @@ class ObjectDB(TypedObject):
     # Database manager
     objects = ObjectDBManager()
 
+    # defaults
+    __settingsclasspath__ = settings.BASE_OBJECT_TYPECLASS
+    __defaultclasspath__ = "evennia.objects.objects.DefaultObject"
+
     @lazy_property
     def contents_cache(self):
         return ContentsHandler(self)

evennia/objects/objects.py

@@ -135,8 +135,6 @@ class DefaultObject(ObjectDB):
     """
     # typeclass setup
     __metaclass__ = TypeclassBase
-    __settingsclasspath__ = settings.BASE_OBJECT_TYPECLASS
-    __defaultclasspath__ = "evennia.objects.objects.DefaultObject"
     objects = ObjectManager()
 
     # on-object properties

evennia/players/models.py

@@ -93,6 +93,10 @@ class PlayerDB(TypedObject, AbstractUser):
     # Database manager
     objects = PlayerDBManager()
 
+    # defaults
+    __settingsclasspath__ = settings.BASE_SCRIPT_TYPECLASS
+    __defaultclasspath__ = "evennia.players.players.DefaultPlayer"
+
     class Meta:
         app_label = 'players'
         verbose_name = 'Player'

evennia/players/players.py

@@ -109,8 +109,6 @@ class DefaultPlayer(PlayerDB):
      """
 
     __metaclass__ = TypeclassBase
-    __settingsclasspath__ = settings.BASE_SCRIPT_TYPECLASS
-    __defaultclasspath__ = "evennia.players.players.DefaultPlayer"
 
     objects = PlayerManager()
 

evennia/scripts/models.py

@@ -100,6 +100,10 @@ class ScriptDB(TypedObject):
     # Database manager
     objects = ScriptDBManager()
 
+    # defaults
+    __settingsclasspath__ = settings.BASE_SCRIPT_TYPECLASS
+    __defaultclasspath__ = "evennia.scripts.scripts.DefaultScript"
+
     class Meta:
         "Define Django meta options"
         verbose_name = "Script"

evennia/scripts/scripts.py

@@ -141,8 +141,6 @@ class ScriptBase(ScriptDB):
 
     """
     __metaclass__ = TypeclassBase
-    __settingsclasspath__ = settings.BASE_SCRIPT_TYPECLASS
-    __defaultclasspath__ = "evennia.scripts.scripts.DefaultScript"
     objects = ScriptManager()