Hopiu/django-imagekit
1
0
Fork 0
mirror of https://github.com/Hopiu/django-imagekit.git synced 2026-04-17 11:41:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix LazyImageCacheFile.__repr__ and __str__

Browse source 
Using SimpleLazyObject also lets us clean things up a bit.

Closes #218
This commit is contained in:
Matthew Tretter 2013-06-04 23:33:09 -04:00
parent 3001069254
commit 01a6c555a1
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
imagekit/cachefiles/__init__.py
View file

@ -1,7 +1,7 @@
from django.conf import settings
from django.core.files import File
from django.core.files.images import ImageFile
from django.utils.functional import LazyObject
from django.utils.functional import SimpleLazyObject
from ..files import BaseIKFile
from ..registry import generator_registry
from ..signals import content_required, existence_required
@ -130,27 +130,12 @@ class ImageCacheFile(BaseIKFile, ImageFile):
return self.cachefile_backend.exists(self)
class LazyImageCacheFile(LazyObject):
class LazyImageCacheFile(SimpleLazyObject):
def __init__(self, generator_id, *args, **kwargs):
super(LazyImageCacheFile, self).__init__()
def setup():
generator = generator_registry.get(generator_id, *args, **kwargs)
self._wrapped = ImageCacheFile(generator)
self.__dict__['_setup'] = setup
return ImageCacheFile(generator)
super(LazyImageCacheFile, self).__init__(setup)
def __repr__(self):
if self._wrapped is None:
self._setup()
return '<%s: %s>' % (self.__class__.__name__, self or 'None')
def __str__(self):
if self._wrapped is None:
self._setup()
return str(self._wrapped)
def __unicode__(self):
if self._wrapped is None:
self._setup()
return unicode(self._wrapped)
return '<%s: %s>' % (self.__class__.__name__, str(self) or 'None')