Hopiu/django-constance
1
0
Fork 0
mirror of https://github.com/jazzband/django-constance.git synced 2026-03-16 22:40:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Simplified settings.

Browse source
This commit is contained in:
Jannis Leidel 2014-11-25 22:19:52 +01:00
parent d051286522
commit fc930442a2
5 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constance/backends/redisd.py
View file

@ -17,7 +17,7 @@ class RedisBackend(Backend):
def __init__(self): def __init__(self):
super(RedisBackend, self).__init__() super(RedisBackend, self).__init__()
self._prefix = settings.REDIS_PREFIX self._prefix = settings.REDIS_PREFIX
connection_cls = settings.CONNECTION_CLASS connection_cls = settings.REDIS_CONNECTION_CLASS
if connection_cls is not None: if connection_cls is not None:
self._rd = utils.import_module_attr(connection_cls)() self._rd = utils.import_module_attr(connection_cls)()
else: else:

23
constance/settings.py
View file

@ -1,24 +1,10 @@
import os from django.conf import settings
from .utils import import_module_attr
settings = import_module_attr(
os.getenv('CONSTANCE_SETTINGS_MODULE', 'django.conf.settings')
)
REDIS_PREFIX = getattr(settings, 'CONSTANCE_REDIS_PREFIX',
getattr(settings, 'CONSTANCE_PREFIX', 'constance:'))
BACKEND = getattr(settings, 'CONSTANCE_BACKEND', BACKEND = getattr(settings, 'CONSTANCE_BACKEND',
'constance.backends.redisd.RedisBackend') 'constance.backends.redisd.RedisBackend')
CONFIG = getattr(settings, 'CONSTANCE_CONFIG', {}) CONFIG = getattr(settings, 'CONSTANCE_CONFIG', {})
CONNECTION_CLASS = getattr(settings, 'CONSTANCE_REDIS_CONNECTION_CLASS',
getattr(settings, 'CONSTANCE_CONNECTION_CLASS', None))
REDIS_CONNECTION = getattr(settings, 'CONSTANCE_REDIS_CONNECTION',
getattr(settings, 'CONSTANCE_CONNECTION', {}))
DATABASE_CACHE_BACKEND = getattr(settings, 'CONSTANCE_DATABASE_CACHE_BACKEND', DATABASE_CACHE_BACKEND = getattr(settings, 'CONSTANCE_DATABASE_CACHE_BACKEND',
None) None)
@ -28,4 +14,11 @@ DATABASE_CACHE_AUTOFILL_TIMEOUT = getattr(settings,
DATABASE_PREFIX = getattr(settings, 'CONSTANCE_DATABASE_PREFIX', '') DATABASE_PREFIX = getattr(settings, 'CONSTANCE_DATABASE_PREFIX', '')
REDIS_PREFIX = getattr(settings, 'CONSTANCE_REDIS_PREFIX', 'constance:')
REDIS_CONNECTION_CLASS = getattr(settings, 'CONSTANCE_REDIS_CONNECTION_CLASS',
None)
REDIS_CONNECTION = getattr(settings, 'CONSTANCE_REDIS_CONNECTION', {})
SUPERUSER_ONLY = getattr(settings, 'CONSTANCE_SUPERUSER_ONLY', True) SUPERUSER_ONLY = getattr(settings, 'CONSTANCE_SUPERUSER_ONLY', True)

4
docs/changes.rst
View file

@ -22,6 +22,10 @@ v1.0 (unreleased)
``CONSTANCE_PREFIX`` ``CONSTANCE_REDIS_PREFIX`` ``CONSTANCE_PREFIX`` ``CONSTANCE_REDIS_PREFIX``
============================== =================================== ============================== ===================================
* The undocumented feature to use an environment variable called
``CONSTANCE_SETTINGS_MODULE`` to define which module to load
settings from has been removed.
v0.6 (2013/04/12) v0.6 (2013/04/12)
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~

2
example/cheeseshop/settings.py
View file

@ -102,7 +102,7 @@ INSTALLED_APPS = (
'constance.backends.database', 'constance.backends.database',
) )
CONSTANCE_CONNECTION = { CONSTANCE_REDIS_CONNECTION = {
'host': 'localhost', 'host': 'localhost',
'port': 6379, 'port': 6379,
'db': 0, 'db': 0,

2
tests/settings.py
View file

@ -43,7 +43,7 @@ INSTALLED_APPS = (
ROOT_URLCONF = 'tests.urls' ROOT_URLCONF = 'tests.urls'
CONSTANCE_CONNECTION_CLASS = 'tests.redis_mockup.Connection' CONSTANCE_REDIS_CONNECTION_CLASS = 'tests.redis_mockup.Connection'
long_value = 123456 long_value = 123456