Minor syntax cleanup.

This commit is contained in:
Jannis Leidel 2012-10-05 12:07:47 +02:00
parent c8bf40ebe3
commit 2650cf0282

View file

@ -13,13 +13,11 @@ from django.contrib.auth.models import User
try:
from cStringIO import StringIO
dir(StringIO) # Placate PyFlakes
except ImportError:
from StringIO import StringIO
try:
from PIL import Image
dir(Image) # Placate PyFlakes
except ImportError:
import Image
@ -80,10 +78,10 @@ class Avatar(models.Model):
avatar = models.ImageField(max_length=1024,
upload_to=avatar_file_path, storage=avatar_storage, blank=True)
date_uploaded = models.DateTimeField(default=now)
def __unicode__(self):
return _(u'Avatar for %s') % self.user
def save(self, *args, **kwargs):
avatars = Avatar.objects.filter(user=self.user)
if self.pk:
@ -96,14 +94,14 @@ class Avatar(models.Model):
avatars.delete()
invalidate_cache(self.user)
super(Avatar, self).save(*args, **kwargs)
def delete(self, *args, **kwargs):
invalidate_cache(self.user)
super(Avatar, self).delete(*args, **kwargs)
def thumbnail_exists(self, size):
return self.avatar.storage.exists(self.avatar_name(size))
def create_thumbnail(self, size, quality=None):
# invalidate the cache of the thumbnail with the given size first
invalidate_cache(self.user, size)
@ -129,11 +127,11 @@ class Avatar(models.Model):
thumb_file = ContentFile(orig)
thumb = self.avatar.storage.save(self.avatar_name(size), thumb_file)
except IOError:
return # What should we do here? Render a "sorry, didn't work" img?
return # What should we do here? Render a "sorry, didn't work" img?
def avatar_url(self, size):
return self.avatar.storage.url(self.avatar_name(size))
def avatar_name(self, size):
ext = find_extension(AVATAR_THUMB_FORMAT)
return avatar_file_path(