Merge pull request #59 from percipient/fix-deprecation-warnings

Fix deprecation warnings
jazzband · Jan 16, 2017 · 8e17297 · 8e17297
2 parents 088e8e8 + f12cb45
commit 8e17297
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/invitations/migrations/0002_auto_20151126_0426.py b/invitations/migrations/0002_auto_20151126_0426.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 from django.conf import settings
 
 EMAIL_MAX_LENGTH = getattr(settings, 'INVITATIONS_EMAIL_MAX_LENGTH', 254)
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='invitation',
             name='inviter',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True, on_delete=django.db.models.deletion.CASCADE),
         ),
         migrations.AlterField(
             model_name='invitation',

diff --git a/invitations/migrations/0003_auto_20151126_1523.py b/invitations/migrations/0003_auto_20151126_1523.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 from django.conf import settings
 
 
@@ -15,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='invitation',
             name='inviter',
-            field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True),
+            field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=django.db.models.deletion.CASCADE),
         ),
     ]
diff --git a/invitations/models.py b/invitations/models.py
@@ -6,9 +6,12 @@
 from django.utils.crypto import get_random_string
 from django.utils.encoding import python_2_unicode_compatible
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.template.context import RequestContext
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 from .managers import InvitationManager
 from .app_settings import app_settings
@@ -26,8 +29,8 @@ class Invitation(models.Model):
                                    default=timezone.now)
     key = models.CharField(verbose_name=_('key'), max_length=64, unique=True)
     sent = models.DateTimeField(verbose_name=_('sent'), null=True)
-    inviter = models.ForeignKey(
-        settings.AUTH_USER_MODEL, null=True, blank=True)
+    inviter = models.ForeignKey(settings.AUTH_USER_MODEL, null=True,
+                                blank=True, on_delete=models.CASCADE)
 
     objects = InvitationManager()