From 3fd8461d9e773884fcbd96c0023f8115d1cf4282 Mon Sep 17 00:00:00 2001 From: Enric Caumons Date: Wed, 3 Jul 2013 20:07:17 +0200 Subject: [PATCH 1/2] Replaced django.conf.urls.defaults by django.conf.urls to suppress warning --- avatar/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avatar/urls.py b/avatar/urls.py index 3635341..cd36d14 100644 --- a/avatar/urls.py +++ b/avatar/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns( 'avatar.views', From 5ad41df92c9a58e5df47f1641da2d536282df279 Mon Sep 17 00:00:00 2001 From: Enric Caumons Date: Tue, 10 Sep 2013 01:19:29 +0200 Subject: [PATCH 2/2] prevents crash when deleting user with attached avatars (fixes #52) --- avatar/models.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/avatar/models.py b/avatar/models.py index 95871b2..1c36f1d 100644 --- a/avatar/models.py +++ b/avatar/models.py @@ -145,7 +145,8 @@ class Avatar(models.Model): def invalidate_avatar_cache(sender, instance, **kwargs): - invalidate_cache(instance.user) + if hasattr(instance, 'user'): + invalidate_cache(instance.user) def create_default_thumbnails(sender, instance, created=False, **kwargs): @@ -156,10 +157,11 @@ def create_default_thumbnails(sender, instance, created=False, **kwargs): def remove_avatar_images(instance=None, **kwargs): - for size in AUTO_GENERATE_AVATAR_SIZES: - if instance.thumbnail_exists(size): - instance.avatar.storage.delete(instance.avatar_name(size)) - instance.avatar.storage.delete(instance.avatar.name) + if hasattr(instance, 'user'): + for size in AUTO_GENERATE_AVATAR_SIZES: + if instance.thumbnail_exists(size): + instance.avatar.storage.delete(instance.avatar_name(size)) + instance.avatar.storage.delete(instance.avatar.name) signals.post_save.connect(create_default_thumbnails, sender=Avatar)