From 69221ba2b410f3965cb627253149bfdb1f49f817 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Fri, 21 Nov 2014 20:16:39 +0100
Subject: [PATCH] Renamed config module to base to prevent ambiguity

This should fix #80 that is triggered by Django's new strickter import time loading process.
---
 constance/__init__.py                   | 2 +-
 constance/admin.py                      | 4 ++--
 constance/apps.py                       | 3 ++-
 constance/backends/database/__init__.py | 6 +++---
 constance/backends/redisd.py            | 4 ++--
 constance/{config.py => base.py}        | 2 +-
 constance/settings.py                   | 2 +-
 tests/storage.py                        | 2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)
 rename constance/{config.py => base.py} (95%)

diff --git a/constance/__init__.py b/constance/__init__.py
index 3b2e246..adf8e32 100644
--- a/constance/__init__.py
+++ b/constance/__init__.py
@@ -1,4 +1,4 @@
-from constance.config import Config
+from .base import Config
 
 try:
     from django.apps import AppConfig  # noqa
diff --git a/constance/admin.py b/constance/admin.py
index c3ab6ce..344103c 100644
--- a/constance/admin.py
+++ b/constance/admin.py
@@ -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()
 
diff --git a/constance/apps.py b/constance/apps.py
index f6fd7fb..8d46d09 100644
--- a/constance/apps.py
+++ b/constance/apps.py
@@ -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'
diff --git a/constance/backends/database/__init__.py b/constance/backends/database/__init__.py
index f3429ef..aa1ceaa 100644
--- a/constance/backends/database/__init__.py
+++ b/constance/backends/database/__init__.py
@@ -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
diff --git a/constance/backends/redisd.py b/constance/backends/redisd.py
index 688eee1..a58d5ef 100644
--- a/constance/backends/redisd.py
+++ b/constance/backends/redisd.py
@@ -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
diff --git a/constance/config.py b/constance/base.py
similarity index 95%
rename from constance/config.py
rename to constance/base.py
index d7ef1a6..99afe62 100644
--- a/constance/config.py
+++ b/constance/base.py
@@ -1,4 +1,4 @@
-from constance import settings, utils
+from . import settings, utils
 
 
 class Config(object):
diff --git a/constance/settings.py b/constance/settings.py
index 4cb5d2f..18625be 100644
--- a/constance/settings.py
+++ b/constance/settings.py
@@ -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')
diff --git a/tests/storage.py b/tests/storage.py
index abbdb68..5e8c249 100644
--- a/tests/storage.py
+++ b/tests/storage.py
@@ -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):