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

Merged conflicts.

Browse source
This commit is contained in:
Griatch 2015-10-19 23:32:00 +02:00
parent 48f1d0b26f
commit 50371b6abd
23 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/utils/dbserialize.py
View file

@ -113,7 +113,7 @@ class _SaverMutable(object):
elif self._db_obj:
self._db_obj.value = self
else:
logger.log_errmsg("_SaverMutable %s has no root Attribute to save to." % self)
logger.log_err("_SaverMutable %s has no root Attribute to save to." % self)
def _convert_mutables(self, data):
"converts mutables to Saver* variants and assigns .parent property"