Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved default class import markers to base model.

Browse source
This commit is contained in:
Griatch 2015-03-14 23:14:47 +01:00
parent 40421bcc76
commit e77d86a8f7
8 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/comms/comms.py
View file

@ -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):

4
evennia/comms/models.py
View file

@ -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"

5
evennia/objects/models.py
View file

@ -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)

2
evennia/objects/objects.py
View file

@ -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

4
evennia/players/models.py
View file

@ -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'

2
evennia/players/players.py
View file

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

4
evennia/scripts/models.py
View file

@ -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"

2
evennia/scripts/scripts.py
View file

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