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

Some refactoring of the error message and code.

Browse source
This commit is contained in:
Griatch 2017-08-24 22:30:04 +02:00
parent d0dc2841d9
commit f0d1abc4ff
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
evennia/utils/dbserialize.py
View file

@ -38,6 +38,12 @@ __all__ = ("to_pickle", "from_pickle", "do_pickle", "do_unpickle",
PICKLE_PROTOCOL = 2 PICKLE_PROTOCOL = 2
# message to send if editing an already deleted Attribute in a savermutable
_ERROR_DELETED_ATTR = (
"{cls_name} {obj} has had its root Attribute deleted. "
"It must be cast to a {non_saver_name} before it can be modified further.")
def _get_mysql_db_version(): def _get_mysql_db_version():
""" """
This is a helper method for specifically getting the version This is a helper method for specifically getting the version
@ -155,10 +161,13 @@ class _SaverMutable(object):
elif self._db_obj: elif self._db_obj:
if not self._db_obj.pk: if not self._db_obj.pk:
cls_name = self.__class__.__name__ cls_name = self.__class__.__name__
non_saver_name = cls_name.lstrip("_Saver") try:
err_msg = "%s %s has had its root Attribute deleted." % (cls_name, self) non_saver_name = cls_name.split("_Saver", 1)[1].lower()
err_msg += " It must be cast to a %s before it can be modified further." % non_saver_name except IndexError:
raise ValueError(err_msg) non_saver_name = cls_name
raise ValueError(_ERROR_DELETED_ATTR.format(cls_name=cls_name, obj=self,
non_saver_name=non_saver_name))
print("self._db_obj.pk")
self._db_obj.value = self self._db_obj.value = self
else: else:
logger.log_err("_SaverMutable %s has no root Attribute to save to." % self) logger.log_err("_SaverMutable %s has no root Attribute to save to." % self)