From bb7e9e58917a54e0982d4d343ed14895b3e9871c Mon Sep 17 00:00:00 2001 From: Matthew Tretter Date: Mon, 10 Jun 2013 18:33:22 -0400 Subject: [PATCH] Fix cache backend fallback Closes #225 Closes #226 --- imagekit/conf.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/imagekit/conf.py b/imagekit/conf.py index 1edad95..2900da1 100644 --- a/imagekit/conf.py +++ b/imagekit/conf.py @@ -24,14 +24,19 @@ class ImageKitConf(AppConf): else: dummy_cache = 'django.core.cache.backends.dummy.DummyCache' + # DEFAULT_CACHE_ALIAS doesn't exist in Django<=1.2 + try: + from django.core.cache import DEFAULT_CACHE_ALIAS as default_cache_alias + except ImportError: + default_cache_alias = 'default' + if settings.DEBUG: value = dummy_cache + elif default_cache_alias in getattr(settings, 'CACHES', {}): + value = default_cache_alias else: - value = ( - getattr(settings, 'CACHES', {}).get('default') - or getattr(settings, 'CACHE_BACKEND', None) - or dummy_cache - ) + value = getattr(settings, 'CACHE_BACKEND', None) or dummy_cache + return value def configure_default_file_storage(self, value):