From 08d0442f9cf5350b3b4cafe55fd08c7b6cf8606d Mon Sep 17 00:00:00 2001 From: Griatch Date: Fri, 19 Dec 2014 16:56:28 +0100 Subject: [PATCH] Strange issue with __init__, proxy implementation not working at the moment. --- src/typeclasses/models.py | 21 ++------------------- src/utils/idmapper/base.py | 1 + 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/typeclasses/models.py b/src/typeclasses/models.py index 6ff1050cc0..961e4a0b20 100644 --- a/src/typeclasses/models.py +++ b/src/typeclasses/models.py @@ -742,23 +742,6 @@ class PermissionHandler(TagHandler): # imported for access by other from src.utils.idmapper.base import SharedMemoryModelBase -class TypeclassModelBase(SharedMemoryModelBase): - """ - Metaclass for typeclasses - """ - def __init__(cls, *args, **kwargs): - """ - We must define our Typeclasses as proxies. We also store the path - directly on the class, this is useful for managers. - """ - super(TypeclassModelBase, cls).__init__(*args, **kwargs) - class Meta: - proxy = True - cls.Meta = Meta - cls.typename = cls.__name__ - cls.path = "%s.%s" % (cls.__module__, cls.__name__) - - class TypeclassBase(SharedMemoryModelBase): """ Metaclass which should be set for the root of model proxies @@ -775,8 +758,8 @@ class TypeclassBase(SharedMemoryModelBase): proxy = True cls.Meta = Meta # convenience for manager methods - cls.typename = cls.__name__ - cls.path = "%s.%s" % (cls.__module__, cls.__name__) + #cls.typename = cls.__name__ + #cls.path = "%s.%s" % (cls.__module__, cls.__name__) class TypedObject(SharedMemoryModel): diff --git a/src/utils/idmapper/base.py b/src/utils/idmapper/base.py index b26c53ff28..231f005831 100755 --- a/src/utils/idmapper/base.py +++ b/src/utils/idmapper/base.py @@ -429,6 +429,7 @@ class SharedMemoryModelBase(ModelBase): """ This is for the typeclass system. """ + super(SharedMemoryModelBase, cls).__init__(*args, **kwargs) cls.typename = cls.__name__ cls.path = "%s.%s" % (cls.__module__, cls.__name__)