diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2016-09-02 07:54:55 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2016-09-02 07:54:55 -0500 |
| commit | 7586aee42bc37432ad07638e254997540aa34007 (patch) | |
| tree | a1cb328974ecefb78c99aca73dd2accf4f7d7861 /src/lib/Bcfg2/DBSettings.py | |
| parent | d359bfdaa44078ae3040f4776c21896ff5205c12 (diff) | |
| parent | b9006b325f7fd71bfe8329a5da4fb4862675b7dd (diff) | |
| download | bcfg2-7586aee42bc37432ad07638e254997540aa34007.tar.gz bcfg2-7586aee42bc37432ad07638e254997540aa34007.tar.bz2 bcfg2-7586aee42bc37432ad07638e254997540aa34007.zip | |
Merge branch 'fix/django1.9/url-tags' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/DBSettings.py')
| -rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index 3b5cbbbd8..6409f8b37 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -65,7 +65,12 @@ settings = dict( # pylint: disable=C0103 'django.core.context_processors.media', 'django.core.context_processors.request'), DATABASE_ROUTERS=['Bcfg2.DBSettings.PerApplicationRouter'], - TEST_RUNNER='django.test.simple.DjangoTestSuiteRunner') + TEST_RUNNER='django.test.simple.DjangoTestSuiteRunner', + CACHES={ + 'default': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + } + }) if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 6: settings['MIDDLEWARE_CLASSES'] += \ @@ -85,15 +90,6 @@ elif HAS_SOUTH: if 'BCFG2_LEGACY_MODELS' in os.environ: settings['INSTALLED_APPS'] += ('Bcfg2.Server.Reports.reports',) -if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] < 3: - settings['CACHE_BACKEND'] = 'locmem:///' -else: - settings['CACHES'] = { - 'default': { - 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', - } - } - def finalize_django_config(opts=None, silent=False): """ Perform final Django configuration """ |