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

Format code with black. Add makefile to run fmt/tests

Browse source
This commit is contained in:
Griatch 2019-09-28 18:18:11 +02:00
parent d00bce9288
commit c2c7fa311a
299 changed files with 19037 additions and 11611 deletions
Download patch file Download diff file Expand all files Collapse all files

31
evennia/server/models.py
View file

@ -18,11 +18,12 @@ from evennia.server.manager import ServerConfigManager
from evennia.utils import picklefield
#------------------------------------------------------------
# ------------------------------------------------------------
#
# ServerConfig
#
#------------------------------------------------------------
# ------------------------------------------------------------
class ServerConfig(WeakSharedMemoryModel):
"""
@ -48,11 +49,13 @@ class ServerConfig(WeakSharedMemoryModel):
# db_value = models.BinaryField(blank=True)
db_value = picklefield.PickledObjectField(
'value', null=True,
"value",
null=True,
help_text="The data returned when the config value is accessed. Must be "
"written as a Python literal if editing through the admin "
"interface. Attribute values which are not Python literals "
"cannot be edited through the admin interface.")
"written as a Python literal if editing through the admin "
"interface. Attribute values which are not Python literals "
"cannot be edited through the admin interface.",
)
objects = ServerConfigManager()
_is_deleted = False
@ -66,43 +69,45 @@ class ServerConfig(WeakSharedMemoryModel):
# is the object in question).
# key property (wraps db_key)
#@property
# @property
def __key_get(self):
"Getter. Allows for value = self.key"
return self.db_key
#@key.setter
# @key.setter
def __key_set(self, value):
"Setter. Allows for self.key = value"
self.db_key = value
self.save()
#@key.deleter
# @key.deleter
def __key_del(self):
"Deleter. Allows for del self.key. Deletes entry."
self.delete()
key = property(__key_get, __key_set, __key_del)
# value property (wraps db_value)
#@property
# @property
def __value_get(self):
"Getter. Allows for value = self.value"
return from_pickle(self.db_value, db_obj=self)
#@value.setter
# @value.setter
def __value_set(self, value):
"Setter. Allows for self.value = value"
if utils.has_parent('django.db.models.base.Model', value):
if utils.has_parent("django.db.models.base.Model", value):
# we have to protect against storing db objects.
logger.log_err("ServerConfig cannot store db objects! (%s)" % value)
return
self.db_value = to_pickle(value)
self.save()
#@value.deleter
# @value.deleter
def __value_del(self):
"Deleter. Allows for del self.value. Deletes entry."
self.delete()
value = property(__value_get, __value_set, __value_del)
class Meta(object):