From 69901569a3c0db03d234300ad766c8d9b2b32f2c Mon Sep 17 00:00:00 2001 From: Clement Cavanier Date: Wed, 6 Dec 2017 15:06:45 +0100 Subject: [PATCH] Support for Django 2 --- avatar/migrations/0001_initial.py | 2 +- avatar/models.py | 2 +- avatar/templatetags/avatar_tags.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/avatar/migrations/0001_initial.py b/avatar/migrations/0001_initial.py index 75ef204..c2c7a3b 100644 --- a/avatar/migrations/0001_initial.py +++ b/avatar/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('primary', models.BooleanField(default=False)), ('avatar', models.ImageField(storage=django.core.files.storage.FileSystemStorage(), max_length=1024, upload_to=avatar.models.avatar_file_path, blank=True)), ('date_uploaded', models.DateTimeField(default=django.utils.timezone.now)), - ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)), ], ), ] diff --git a/avatar/models.py b/avatar/models.py index ddf1ff3..5268983 100644 --- a/avatar/models.py +++ b/avatar/models.py @@ -90,7 +90,7 @@ class AvatarField(models.ImageField): class Avatar(models.Model): user = models.ForeignKey( getattr(settings, 'AUTH_USER_MODEL', 'auth.User'), - verbose_name=_("user"), + verbose_name=_("user"), on_delete=models.CASCADE, ) primary = models.BooleanField( verbose_name=_("primary"), diff --git a/avatar/templatetags/avatar_tags.py b/avatar/templatetags/avatar_tags.py index d3feee0..240f88d 100644 --- a/avatar/templatetags/avatar_tags.py +++ b/avatar/templatetags/avatar_tags.py @@ -1,5 +1,5 @@ from django import template -from django.core.urlresolvers import reverse +from django.urls import reverse from django.template.loader import render_to_string from django.utils import six from django.utils.translation import ugettext as _