From b5cf27fc181d0d80d127fcd51d388da9265cc530 Mon Sep 17 00:00:00 2001 From: Ryan Stein Date: Sun, 29 Oct 2017 22:20:23 -0400 Subject: [PATCH] Fix ServerConfig model for Py3. --- evennia/server/models.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/evennia/server/models.py b/evennia/server/models.py index 92cfe88ed6..c31d203532 100644 --- a/evennia/server/models.py +++ b/evennia/server/models.py @@ -8,12 +8,7 @@ Config values should usually be set through the manager's conf() method. """ -from builtins import object - -try: - import pickle as pickle -except ImportError: - import pickle +import pickle from django.db import models from evennia.utils.idmapper.models import WeakSharedMemoryModel @@ -48,7 +43,7 @@ class ServerConfig(WeakSharedMemoryModel): # main name of the database entry db_key = models.CharField(max_length=64, unique=True) # config value - db_value = models.TextField(blank=True) + db_value = models.BinaryField(blank=True) objects = ServerConfigManager() _is_deleted = False @@ -83,7 +78,7 @@ class ServerConfig(WeakSharedMemoryModel): #@property def __value_get(self): "Getter. Allows for value = self.value" - return pickle.loads(str(self.db_value)) + return pickle.loads(self.db_value) #@value.setter def __value_set(self, value):