Fixed bad caching of transparent thumbnails when using a remote stora…

…ge backend.
winhamwr · Sep 16, 2010 · d1e74f2 · d1e74f2
1 parent 895c20c
commit d1e74f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/easy_thumbnails/files.py b/easy_thumbnails/files.py
@@ -320,7 +320,7 @@ def get_thumbnail(self, thumbnail_options, save=True):
             save_thumbnail(thumbnail, self.thumbnail_storage)
             # Ensure the right thumbnail name is used based on the transparency
             # of the image.
-            filename = (self.is_transparent(thumbnail) and transparent_name or
+            filename = (self.is_transparent(thumbnail.image) and transparent_name or
                         opaque_name)
             self.get_thumbnail_cache(filename, create=True, update=True)
 

diff --git a/easy_thumbnails/tests/templatetags.py b/easy_thumbnails/tests/templatetags.py
@@ -301,7 +301,7 @@ def testBasicCached(self):
         if utils.is_storage_local(self.storage):
             self.assertEqual(output, 'src="%s"' % expected_url)
         else:
-            self.assertTrue(output.find(expected) != -1)
+            self.assertTrue(output.find(expected) != -1, "Actual output:%s" % output)
 
         # Ensure that we didn't add another thumbnail to the cache
         self.assertEqual(Thumbnail.objects.all().count(), 1)