From b33869a9f8d25c7c4d5a720c120309bae1fa71c0 Mon Sep 17 00:00:00 2001 From: Matthew Tretter Date: Mon, 25 Feb 2013 22:18:33 -0500 Subject: [PATCH] Sourceless specs are falsy Passes test added in 190153d. Related to #187 --- imagekit/cachefiles/__init__.py | 8 +++++--- imagekit/specs/__init__.py | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/imagekit/cachefiles/__init__.py b/imagekit/cachefiles/__init__.py index 974b643..e606e18 100644 --- a/imagekit/cachefiles/__init__.py +++ b/imagekit/cachefiles/__init__.py @@ -27,10 +27,12 @@ class ImageCacheFile(BaseIKFile, ImageFile): """ self.generator = generator - name = name or getattr(generator, 'cachefile_name', None) if not name: - fn = get_by_qname(settings.IMAGEKIT_CACHEFILE_NAMER, 'namer') - name = fn(generator) + try: + name = generator.cachefile_name + except AttributeError: + fn = get_by_qname(settings.IMAGEKIT_CACHEFILE_NAMER, 'namer') + name = fn(generator) self.name = name storage = storage or getattr(generator, 'cachefile_storage', diff --git a/imagekit/specs/__init__.py b/imagekit/specs/__init__.py index 969dcf3..a8fa742 100644 --- a/imagekit/specs/__init__.py +++ b/imagekit/specs/__init__.py @@ -82,6 +82,8 @@ class ImageSpec(BaseImageSpec): @property def cachefile_name(self): + if not self.source: + return None fn = get_by_qname(settings.IMAGEKIT_SPEC_CACHEFILE_NAMER, 'namer') return fn(self)