Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-29 03:57:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made the proxy typeclass system work in principle, using a wrapper of the __new__ method for the class.

Browse source
This commit is contained in:
Griatch 2014-12-20 18:30:39 +01:00
parent 8314d8ba5e
commit 32e44dceab
7 changed files with 26 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/comms/comms.py
View file

@ -4,7 +4,6 @@ Default Typeclass for Comms.
See objects.objects for more information on Typeclassing.
"""
from src.comms.models import Msg, TempMsg, ChannelDB
from src.typeclasses.models import TypeclassBase
from src.utils import logger
from src.utils.utils import make_iter
@ -14,19 +13,7 @@ class Channel(ChannelDB):
This is the base class for all Comms. Inherit from this to create different
types of communication channels.
"""
def __new__(cls, *args, **kwargs):
"""
We must define our Typeclasses as proxies. We also store the path
directly on the class, this is useful for managers.
"""
if hasattr(cls, "Meta"):
cls.Meta.proxy = True
else:
class Meta:
proxy = True
cls.Meta = Meta
return super(TypeclassBase, cls).__new__(*args, **kwargs)
_is_typeclass = True
# helper methods, for easy overloading

14
src/objects/objects.py
View file

@ -17,7 +17,6 @@ they control by simply linking to a new object's user property.
from django.conf import settings
from src.objects.models import ObjectDB
from src.typeclasses.models import TypeclassBase
from src.commands import cmdset, command
from src.utils.logger import log_depmsg
@ -37,18 +36,7 @@ class Object(ObjectDB):
This is the base class for all in-game objects. Inherit from this
to create different types of objects in the game.
"""
def __new__(cls, *args, **kwargs):
"""
We must define our Typeclasses as proxies. We also store the path
directly on the class, this is useful for managers.
"""
if hasattr(cls, "Meta"):
cls.Meta.proxy = True
else:
class Meta:
proxy = True
cls.Meta = Meta
return super(Object, cls).__new__(*args, **kwargs)
_is_typeclass = True
# __init__ is only defined here in order to present docstring to API.
def __init__(self):

14
src/players/player.py
View file

@ -22,23 +22,11 @@ _MULTISESSION_MODE = settings.MULTISESSION_MODE
_CMDSET_PLAYER = settings.CMDSET_PLAYER
_CONNECT_CHANNEL = None
class Player(PlayerDB):
"""
Base typeclass for all Players.
"""
def __new__(cls, *args, **kwargs):
"""
We must define our Typeclasses as proxies. We also store the path
directly on the class, this is useful for managers.
"""
if hasattr(cls, "Meta"):
cls.Meta.proxy = True
else:
class Meta:
proxy = True
cls.Meta = Meta
return super(Player, cls).__new__(*args, **kwargs)
_is_typeclass = True
def __init__(self):
"""

17
src/scripts/scripts.py
View file

@ -9,7 +9,6 @@ from twisted.internet.defer import Deferred, maybeDeferred
from twisted.internet.task import LoopingCall
from django.conf import settings
from django.utils.translation import ugettext as _
from src.typeclasses.models import TypeclassBase
from src.scripts.models import ScriptDB
from src.comms import channelhandler
from src.utils import logger
@ -113,21 +112,7 @@ class ScriptBase(ScriptDB):
Base class for scripts. Don't inherit from this, inherit
from the class 'Script' instead.
"""
#__metaclass__ = TypeclassBase
# private methods
def __new__(cls, *args, **kwargs):
"""
We must define our Typeclasses as proxies. We also store the path
directly on the class, this is useful for managers.
"""
if hasattr(cls, "Meta"):
cls.Meta.proxy = True
else:
class Meta:
proxy = True
cls.Meta = Meta
return super(ScriptBase, cls).__new__(*args, **kwargs)
_is_typeclass = True
def __eq__(self, other):
"""

1
src/typeclasses/managers.py
View file

@ -51,7 +51,6 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
Overload the standard get. This will limit itself to only
return the current typeclass.
"""
print self.model
kwargs.update({"db_typeclass_path":self.model.path})
return super(TypedObjectManager, self).get(**kwargs)

2
src/typeclasses/models.py
View file

@ -740,7 +740,7 @@ class PermissionHandler(TagHandler):
#------------------------------------------------------------
# imported for access by other
from src.utils.idmapper.base import SharedMemoryModelBase
#from src.utils.idmapper.base import SharedMemoryModelBase
#class TypeclassBase(SharedMemoryModelBase):
# """

41
src/utils/idmapper/base.py
View file

@ -30,8 +30,7 @@ from django.db.models.base import subclass_exception
import warnings
from django.db.models.options import Options
from django.utils.deprecation import RemovedInDjango19Warning
from django.core.exceptions import (ObjectDoesNotExist,
MultipleObjectsReturned, FieldError)
from django.core.exceptions import MultipleObjectsReturned
from django.apps.config import MODELS_MODULE_NAME
from django.db.models.fields.related import OneToOneField
#/ django patch imports
@ -95,6 +94,15 @@ class SharedMemoryModelBase(ModelBase):
already has a wrapper of the given name, the automatic creation is skipped. Note: Remember to
document this auto-wrapping in the class header, this could seem very much like magic to the user otherwise.
"""
# set up the typeclass handling only if a variable _is_typeclass is set on the class
if "_is_typeclass" in attrs:
if "Meta" in attrs:
attrs["Meta"].proxy = True
else:
class Meta:
proxy = True
attrs["Meta"] = Meta
def create_wrapper(cls, fieldname, wrappername, editable=True, foreignkey=False):
"Helper method to create property wrappers with unique names (must be in separate call)"
def _get(cls, fname):
@ -189,9 +197,8 @@ class SharedMemoryModelBase(ModelBase):
#print "wrapping %s -> %s" % (fieldname, wrappername)
create_wrapper(cls, fieldname, wrappername, editable=field.editable, foreignkey=foreignkey)
# django patch
# Evennia mod, based on Django Ticket #11560: https://code.djangoproject.com/ticket/11560
# The actual patch is small and further down.
# patch start
super_new = super(ModelBase, cls).__new__
# Also ensure initialization is only performed for subclasses of Model
@ -319,16 +326,14 @@ class SharedMemoryModelBase(ModelBase):
raise TypeError("Abstract base class containing model fields not permitted for proxy model '%s'." % name)
else:
continue
# Evennia mod, based on Django Ticket #11560: https://code.djangoproject.com/ticket/11560
# This allows multiple inheritance for proxy models
while parent._meta.proxy:
parent = parent._meta.proxy_for_model
if base is not None and base is not parent:
#if base is not None:
if base is not None:
raise TypeError("Proxy model '%s' has more than one non-abstract model base class." % name)
else:
base = parent
if base is None:
#if base is None: # patch
while parent._meta.proxy: # patch
parent = parent._meta.proxy_for_model # patch
if base is not None and base is not parent: # patch
raise TypeError("Proxy model '%s' has no non-abstract model base class." % name)
new_class._meta.setup_proxy(base)
new_class._meta.concrete_model = base._meta.concrete_model
@ -423,14 +428,10 @@ class SharedMemoryModelBase(ModelBase):
new_class._meta.apps.register_model(new_class._meta.app_label, new_class)
return new_class
def __init__(cls, *args, **kwargs):
"""
This is for the typeclass system.
"""
super(SharedMemoryModelBase, cls).__init__(*args, **kwargs)
cls.typename = cls.__name__
cls.path = "%s.%s" % (cls.__module__, cls.__name__)
print "shared __init__", cls
# /patch end
#return super(SharedMemoryModelBase, cls).__new__(cls, name, bases, attrs, *args, **kwargs)
class SharedMemoryModel(Model):
# CL: setting abstract correctly to allow subclasses to inherit the default