From de72b28396e03243ff0511a2bc08a941670d48be Mon Sep 17 00:00:00 2001 From: Jiri Barton Date: Mon, 23 Aug 2010 15:48:15 +0200 Subject: [PATCH] updated to work with pickle --- constance/config.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/constance/config.py b/constance/config.py index b3e166b..c246b42 100644 --- a/constance/config.py +++ b/constance/config.py @@ -5,7 +5,7 @@ from django.utils.importlib import import_module try: from cPickle import loads, dumps -except ImportError +except ImportError: from pickle import loads, dumps @@ -21,12 +21,13 @@ class Config(object): super(Config, self).__setattr__('_rd', redis.Redis(**settings.CONSTANCE_CONNECTION)) def __getattr__(self, key): - default, decode, help_text = settings.CONSTANCE_CONFIG[key] - result = loads(self._rd.get("%s%s" % (self._prefix, key))) + default, help_text = settings.CONSTANCE_CONFIG[key] + result = self._rd.get("%s%s" % (self._prefix, key)) if result is None: result = default setattr(self, key, default) - return decode(result) + return result + return loads(result) def __setattr__(self, key, value): self._rd.set("%s%s" % (self._prefix, key), dumps(value))