Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a bug in comms' typeclass->dbobj conversion

Browse source
This commit is contained in:
Griatch 2012-11-04 14:42:29 +01:00
parent 2d75648eb1
commit a4a50fdb87
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/comms/managers.py
View file

@ -7,6 +7,7 @@ from django.db import models
from django.db.models import Q from django.db.models import Q
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
_GA = object.__getattribute__
_PlayerDB = None _PlayerDB = None
_ObjectDB = None _ObjectDB = None
_Channel = None _Channel = None
@ -58,7 +59,7 @@ def identify_object(inp):
return inp, None return inp, None
# try to identify the type # try to identify the type
try: try:
obj = inp.dbobj # this works for all typeclassed entities obj = _GA(inp, "dbobj") # this works for all typeclassed entities
except AttributeError: except AttributeError:
obj = inp obj = inp
typ = type(obj) typ = type(obj)

1
src/comms/models.py
View file

@ -30,6 +30,7 @@ from src.utils.utils import is_iter, to_str, crop, make_iter
__all__ = ("Msg", "TempMsg", "Channel", "PlayerChannelConnection", "ExternalChannelConnection") __all__ = ("Msg", "TempMsg", "Channel", "PlayerChannelConnection", "ExternalChannelConnection")
#------------------------------------------------------------ #------------------------------------------------------------
# #
# Msg # Msg