Merge with Kelketek's branch (which also includes dbenoy's branch)

This commit is contained in:
Griatch 2013-08-10 18:09:42 +02:00
commit ca11e7de44
8 changed files with 28 additions and 20 deletions

View file

@ -137,9 +137,8 @@ def create_object(typeclass, key=None, location=None,
else:
new_object.home = settings.CHARACTER_DEFAULT_HOME
if location:
new_object.move_to(location, quiet=True)
new_object.move_to(location, quiet=True)
else:
# rooms would have location=None.
new_object.location = None

View file

@ -96,6 +96,7 @@ class SharedMemoryModelBase(ModelBase):
def _set(cls, fname, value):
"Wrapper for setting database field"
#print "_set:", fname
if hasattr(value, "dbobj"):
value = _GA(value, "dbobj")
elif isinstance(value, basestring) and (value.isdigit() or value.startswith("#")):