From f2e971b3929f93441dc3c0708d2c4f0673127cac Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 8 Dec 2012 20:45:52 +0100 Subject: [PATCH] Have Msg access methods return typeclasses where appropriate instead of dbobjs, to make it more straightforward to compare things. Resolves Issue 329. --- src/comms/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/comms/models.py b/src/comms/models.py index d9eaf31007..952a30413b 100644 --- a/src/comms/models.py +++ b/src/comms/models.py @@ -114,7 +114,8 @@ class Msg(SharedMemoryModel): #@property def __senders_get(self): "Getter. Allows for value = self.sender" - return list(self.db_sender_players.all()) + list(self.db_sender_objects.all()) + return [hasattr(o, "typeclass") and o.typeclass or o for o in + list(self.db_sender_players.all()) + list(self.db_sender_objects.all())] #@sender.setter def __senders_set(self, value): "Setter. Allows for self.sender = value" @@ -160,7 +161,8 @@ class Msg(SharedMemoryModel): #@property def __receivers_get(self): "Getter. Allows for value = self.receivers. Returns three lists of receivers: players, objects and channels." - return list(self.db_receivers_players.all()) + list(self.db_receivers_objects.all()) + return [hasattr(o, "typeclass") and o.typeclass or o for o in + list(self.db_receivers_players.all()) + list(self.db_receivers_objects.all())] #@receivers.setter def __receivers_set(self, value): "Setter. Allows for self.receivers = value. This appends a new receiver to the message."