From 3a5d7da0d8086cf231fa105d019001e27befd0c8 Mon Sep 17 00:00:00 2001 From: Matthew Tretter Date: Thu, 23 Feb 2012 17:46:57 -0500 Subject: [PATCH] Validate the image any time the file is required This means that accessing `path` or `size` will also validate, closing #109 --- imagekit/models/fields/files.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/imagekit/models/fields/files.py b/imagekit/models/fields/files.py index 8900b74..1e1d3e4 100644 --- a/imagekit/models/fields/files.py +++ b/imagekit/models/fields/files.py @@ -36,12 +36,8 @@ class ImageSpecFieldFile(ImageFieldFile): def _require_file(self): if not self.source_file: raise ValueError("The '%s' attribute's image_field has no file associated with it." % self.attname) - - def _get_file(self): - self.validate() - return super(ImageFieldFile, self).file - - file = property(_get_file, ImageFieldFile._set_file, ImageFieldFile._del_file) + else: + self.validate() def clear(self): return self.field.image_cache_backend.clear(self) @@ -61,11 +57,6 @@ class ImageSpecFieldFile(ImageFieldFile): return self.field.generator.generate_file(self.name, self.source_file, save) - @property - def url(self): - self.validate() - return super(ImageFieldFile, self).url - def delete(self, save=False): """ Pulled almost verbatim from ``ImageFieldFile.delete()`` and