From e77d86a8f78b663e2c731f343fbd72b3a68f82f4 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 14 Mar 2015 23:14:47 +0100
Subject: [PATCH] Moved default class import markers to base model.

---
 evennia/comms/comms.py     | 2 --
 evennia/comms/models.py    | 4 ++--
 evennia/objects/models.py  | 5 +++++
 evennia/objects/objects.py | 2 --
 evennia/players/models.py  | 4 ++++
 evennia/players/players.py | 2 --
 evennia/scripts/models.py  | 4 ++++
 evennia/scripts/scripts.py | 2 --
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/evennia/comms/comms.py b/evennia/comms/comms.py
index 622ba58feb..1196cce81e 100644
--- a/evennia/comms/comms.py
+++ b/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):
diff --git a/evennia/comms/models.py b/evennia/comms/models.py
index a3a6869702..dd00378077 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -469,8 +469,8 @@ class ChannelDB(TypedObject):
     # Database manager
     objects = managers.ChannelDBManager()
 
-    _typeclass_paths = settings.CHANNEL_TYPECLASS_PATHS
-    _default_typeclass_path = settings.BASE_CHANNEL_TYPECLASS or "evennia.comms.comms.Channel"
+    __settingclasspath__ = settings.BASE_CHANNEL_TYPECLASS
+    __defaultclasspath__ = "evennia.comms.comms.DefaultChannel"
 
     class Meta:
         "Define Django meta options"
diff --git a/evennia/objects/models.py b/evennia/objects/models.py
index 826ed25200..5c34eb472d 100644
--- a/evennia/objects/models.py
+++ b/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)
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 9358e04042..90b149fda3 100644
--- a/evennia/objects/objects.py
+++ b/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
diff --git a/evennia/players/models.py b/evennia/players/models.py
index 141f30e992..c688664e54 100644
--- a/evennia/players/models.py
+++ b/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'
diff --git a/evennia/players/players.py b/evennia/players/players.py
index ad39e95073..a7a422a826 100644
--- a/evennia/players/players.py
+++ b/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()
 
diff --git a/evennia/scripts/models.py b/evennia/scripts/models.py
index 3dcfc95895..f64283eb3e 100644
--- a/evennia/scripts/models.py
+++ b/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"
diff --git a/evennia/scripts/scripts.py b/evennia/scripts/scripts.py
index 6101fd52dd..345f951845 100644
--- a/evennia/scripts/scripts.py
+++ b/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()