From d5d5fc0550861499876db2e4f544fad4f84562e2 Mon Sep 17 00:00:00 2001 From: Matthew Tretter Date: Fri, 10 May 2013 00:26:46 -0400 Subject: [PATCH] Add cachefile backend fallback The generator shouldn't have to implement `cachefile_backend` --- imagekit/cachefiles/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/imagekit/cachefiles/__init__.py b/imagekit/cachefiles/__init__.py index c60d8a9..12a0124 100644 --- a/imagekit/cachefiles/__init__.py +++ b/imagekit/cachefiles/__init__.py @@ -38,8 +38,11 @@ class ImageCacheFile(BaseIKFile, ImageFile): storage = storage or getattr(generator, 'cachefile_storage', None) or get_singleton(settings.IMAGEKIT_DEFAULT_FILE_STORAGE, 'file storage backend') - self.cachefile_backend = cachefile_backend or getattr(generator, - 'cachefile_backend', None) + self.cachefile_backend = ( + cachefile_backend + or getattr(generator, 'cachefile_backend', None) + or get_singleton(settings.IMAGEKIT_DEFAULT_CACHEFILE_BACKEND, + 'cache file backend')) super(ImageCacheFile, self).__init__(storage=storage)