From 1d47906eb572545e1b496fde58e9098e001bf0e5 Mon Sep 17 00:00:00 2001 From: Jiri Barton Date: Mon, 23 Aug 2010 14:04:43 +0200 Subject: [PATCH 1/2] hardcoded the version spec --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f44c7c7..a732890 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages setup( name='django-constance', - version=os.environ.get('VERSION', '0.0.1'), + version='0.0.1', description='Django live settings stored in redis', author='Comoga Django Team', author_email='comoga@bitbucket.org', From 8771e43e69d31e81155d655b661a97e2722e9eed Mon Sep 17 00:00:00 2001 From: Jiri Barton Date: Mon, 23 Aug 2010 14:45:36 +0200 Subject: [PATCH 2/2] changed the default attribute access --- constance/config.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/constance/config.py b/constance/config.py index bff3100..78074f4 100644 --- a/constance/config.py +++ b/constance/config.py @@ -8,24 +8,21 @@ from django.utils.importlib import import_module class Config(object): def __init__(self): + super(Config, self).__setattr__('_prefix', getattr(settings.CONSTANCE_PREFIX, 'constance:') try: module, class_ = settings.CONSTANCE_CONNECTION_CLASS.rsplit('.') - self._rd = getattr(import_module(module), class_)() + super(Config, self).__setattr__('_rd', getattr(import_module(module), class_)()) except AttributeError: - self._rd = redis.Redis(**settings.CONSTANCE_CONNECTION) + super(Config, self).__setattr__('_rd', redis.Redis(**settings.CONSTANCE_CONNECTION)) def __getattr__(self, key): - if key.startswith('_'): - return super(Config, self).__getattr__(key, value) default, decode, help_text = settings.CONSTANCE_CONFIG[key] - result = self._rd.get("%s%s" % (self.prefix, key)) + result = self._rd.get("%s%s" % (self._prefix, key)) if result is None: result = default setattr(self, key, default) return decode(result) def __setattr__(self, key, value): - if key.startswith('_'): - return super(Config, self).__setattr__(key, value) - self._rd.set("%s%s" % (self.prefix, key), value) + self._rd.set("%s%s" % (self._prefix, key), value)