mirror of
https://github.com/jazzband/django-constance.git
synced 2026-03-16 22:40:24 +00:00
Renamed config module to base to prevent ambiguity
This should fix #80 that is triggered by Django's new strickter import time loading process.
This commit is contained in:
parent
8b0ed361d6
commit
69221ba2b4
8 changed files with 13 additions and 12 deletions
|
|
@ -1,4 +1,4 @@
|
|||
from constance.config import Config
|
||||
from .base import Config
|
||||
|
||||
try:
|
||||
from django.apps import AppConfig # noqa
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ except ImportError: # Django < 1.4
|
|||
from django.conf.urls.defaults import patterns, url
|
||||
|
||||
|
||||
from constance import settings
|
||||
from constance.config import Config as ConfigClass
|
||||
from . import settings
|
||||
from .base import Config as ConfigClass
|
||||
|
||||
config = ConfigClass()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
from django.apps import AppConfig
|
||||
from constance.config import Config
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from .base import Config
|
||||
|
||||
|
||||
class ConstanceConfig(AppConfig):
|
||||
name = 'constance'
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ try:
|
|||
except ImportError:
|
||||
from django.core.cache.backends.locmem import CacheClass as LocMemCache
|
||||
|
||||
from constance.backends import Backend
|
||||
from constance import settings
|
||||
from .. import Backend
|
||||
from ... import settings
|
||||
|
||||
|
||||
class DatabaseBackend(Backend):
|
||||
def __init__(self):
|
||||
from constance.backends.database.models import Constance
|
||||
from .models import Constance
|
||||
self._model = Constance
|
||||
self._prefix = settings.DATABASE_PREFIX
|
||||
self._autofill_timeout = settings.DATABASE_CACHE_AUTOFILL_TIMEOUT
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ from six.moves import zip
|
|||
|
||||
from django.core.exceptions import ImproperlyConfigured
|
||||
|
||||
from constance import settings, utils
|
||||
from constance.backends import Backend
|
||||
from .. import Backend
|
||||
from ... import settings, utils
|
||||
|
||||
try:
|
||||
from cPickle import loads, dumps
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from constance import settings, utils
|
||||
from . import settings, utils
|
||||
|
||||
|
||||
class Config(object):
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import os
|
||||
from constance.utils import import_module_attr
|
||||
from .utils import import_module_attr
|
||||
|
||||
settings = import_module_attr(
|
||||
os.getenv('CONSTANCE_SETTINGS_MODULE', 'django.conf.settings')
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ if six.PY3:
|
|||
def long(value):
|
||||
return value
|
||||
|
||||
from constance.config import Config
|
||||
from constance.base import Config
|
||||
|
||||
|
||||
class StorageTestsMixin(object):
|
||||
|
|
|
|||
Loading…
Reference in a new issue