From: Stephen Finucane <stephen@that.guru>
Date: Fri, 19 May 2017 14:52:21 +0000 (+0100)
Subject: models: Remove 'permalink' decorator
X-Git-Tag: v2.1.0-rc1~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c18ad4de31f6536fa24c621e5f7a6c3be48606f8;p=thirdparty%2Fpatchwork.git

models: Remove 'permalink' decorator

This is deprecated in Django 1.11 [1] Let's pre-empt the inevitable
warnings...or not [2].

[1] https://docs.djangoproject.com/en/dev/releases/1.11/#features-deprecated-in-1-11
[2] https://docs.djangoproject.com/en/dev/releases/1.11/#deprecating-warnings-are-no-longer-loud-by-default

Signed-off-by: Stephen Finucane <stephen@that.guru>
Signed-off-by: Daniel Axtens <dja@axtens.net>
---

diff --git a/patchwork/models.py b/patchwork/models.py
index d4075cf3..7d413d93 100644
--- a/patchwork/models.py
+++ b/patchwork/models.py
@@ -34,6 +34,7 @@ from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 
 from patchwork.compat import is_authenticated
+from patchwork.compat import reverse
 from patchwork.fields import HashField
 from patchwork.hasher import hash_diff
 
@@ -382,9 +383,8 @@ class SeriesMixin(object):
 
 class CoverLetter(SeriesMixin, Submission):
 
-    @models.permalink
     def get_mbox_url(self):
-        return ('cover-mbox', (), {'cover_id': self.id})
+        return reverse('cover-mbox', kwargs={'cover_id': self.id})
 
 
 @python_2_unicode_compatible
@@ -548,13 +548,11 @@ class Patch(SeriesMixin, Submission):
 
         return counts
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('patch-detail', (), {'patch_id': self.id})
+        return reverse('patch-detail', kwargs={'patch_id': self.id})
 
-    @models.permalink
     def get_mbox_url(self):
-        return ('patch-mbox', (), {'patch_id': self.id})
+        return reverse('patch-mbox', kwargs={'patch_id': self.id})
 
     def __str__(self):
         return self.name
@@ -698,9 +696,8 @@ class Series(FilenameMixin, models.Model):
                                           patch=patch,
                                           number=number)
 
-    @models.permalink
     def get_mbox_url(self):
-        return ('series-mbox', (), {'series_id': self.id})
+        return reverse('series-mbox', kwargs={'series_id': self.id})
 
     def __str__(self):
         return self.name if self.name else 'Untitled series #%d' % self.id
@@ -776,17 +773,17 @@ class Bundle(models.Model):
         return BundlePatch.objects.create(bundle=self, patch=patch,
                                           order=max_order + 1)
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('bundle-detail', (), {
+        return reverse('bundle-detail', kwargs={
             'username': self.owner.username,
             'bundlename': self.name,
         })
 
-    @models.permalink
     def get_mbox_url(self):
-        return ('bundle-mbox', (), {'bundlename': self.name,
-                                    'username': self.owner.username})
+        return reverse('bundle-mbox', kwargs={
+            'bundlename': self.name,
+            'username': self.owner.username
+        })
 
     class Meta:
         unique_together = [('owner', 'name')]