From: Stephen Finucane <stephen@that.guru>
Date: Sat, 6 Oct 2018 21:27:01 +0000 (+0100)
Subject: Revert "models: Only set 'base_manager_name' for Django >= 1.10"
X-Git-Tag: v2.0.4~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75564e93e1517b10fd777fd3e1061552ea2f7f0f;p=thirdparty%2Fpatchwork.git

Revert "models: Only set 'base_manager_name' for Django >= 1.10"

This reverts commit 5708fb48adecfd9929366b114bdb6d4cd09df74e.

This change required a migration which was not included in 2.0.0. It's
not possible to backport the migration but since this change only hides
a warning in the versions of Django supported here, it's easy to just
revert this.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Stable-Only
---

diff --git a/patchwork/models.py b/patchwork/models.py
index ec110189..d738ed97 100644
--- a/patchwork/models.py
+++ b/patchwork/models.py
@@ -569,8 +569,7 @@ class Patch(SeriesMixin, Submission):
 
     class Meta:
         verbose_name_plural = 'Patches'
-        if django.VERSION >= (1, 10):
-            base_manager_name = 'objects'
+        base_manager_name = 'objects'
 
 
 class Comment(EmailMixin, models.Model):