Remove support code for Django < 1.8.

charettes · Jan 21, 2017 · 70e563e · 70e563e
1 parent 7cfeaf0
commit 70e563e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 57 deletions.
diff --git a/mutant/db/fields/python.py b/mutant/db/fields/python.py
@@ -3,11 +3,8 @@
 import os
 import re
 
-import django
 from django.core.exceptions import ValidationError
-from django.db import models
 from django.db.models.fields import CharField
-from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 from ...validators import validate_python_identifier
@@ -34,10 +31,7 @@ def to_python(self, value):
             return value
 
 
-PythonIdentifierFieldBase = type if django.VERSION >= (1, 8) else models.SubfieldBase
-
-
-class PythonIdentifierField(six.with_metaclass(PythonIdentifierFieldBase, CharField)):
+class PythonIdentifierField(CharField):
     default_validators = [validate_python_identifier]
     description = _('Python identifier')
 

diff --git a/mutant/managers.py b/mutant/managers.py
@@ -1,8 +1,5 @@
 from __future__ import unicode_literals
 
-import warnings
-
-import django
 from django.db import models
 
 
@@ -15,14 +12,3 @@ def __init__(self, *args, **kwargs):
     def get_queryset(self):
         qs = super(FilteredQuerysetManager, self).get_queryset()
         return qs.filter(*self.args, **self.kwargs)
-
-    if django.VERSION < (1, 8):
-        def get_query_set(self):
-            warnings.warn(
-                "`FilteredQuerysetManager.get_query_set` is deprecated, "
-                "use `get_queryset` instead",
-                DeprecationWarning if django.VERSION >= (1, 7)
-                else PendingDeprecationWarning,
-                stacklevel=2
-            )
-            return FilteredQuerysetManager.get_queryset(self)
diff --git a/mutant/models/field/managers.py b/mutant/models/field/managers.py
@@ -1,8 +1,5 @@
 from __future__ import unicode_literals
 
-import warnings
-
-import django
 from django.db import models
 from polymodels.managers import PolymorphicManager, PolymorphicQuerySet
 
@@ -18,21 +15,7 @@ def create_with_default(self, default, **kwargs):
         return obj
 
 
-class FieldDefinitionManager(PolymorphicManager):
-    def get_queryset(self):
-        return FieldDefinitionQuerySet(self.model, using=self._db)
-
-    if django.VERSION < (1, 8):
-        def get_query_set(self):
-            warnings.warn(
-                "`FieldDefinitionManager.get_query_set` is deprecated, "
-                "use `get_queryset` instead.",
-                DeprecationWarning if django.VERSION >= (1, 7)
-                else PendingDeprecationWarning,
-                stacklevel=2
-            )
-            return FieldDefinitionManager.get_queryset(self)
-
+class FieldDefinitionManager(PolymorphicManager.from_queryset(FieldDefinitionQuerySet)):
     def get_by_natural_key(self, app_label, model, name):
         qs = self.select_subclasses()
         return qs.get(model_def__app_label=app_label,
@@ -58,22 +41,5 @@ def construct(self):
         return tuple(choices_from_dict(choices))
 
 
-class FieldDefinitionChoiceManager(models.Manager):
+class FieldDefinitionChoiceManager(models.Manager.from_queryset(FieldDefinitionChoiceQuerySet)):
     use_for_related_fields = True
-
-    def get_queryset(self):
-        return FieldDefinitionChoiceQuerySet(self.model, using=self._db)
-
-    if django.VERSION < (1, 8):
-        def get_query_set(self):
-            warnings.warn(
-                "`FieldDefinitionChoiceManager.get_query_set` is"
-                "deprecated, use `get_queryset` instead.",
-                DeprecationWarning if django.VERSION >= (1, 7)
-                else PendingDeprecationWarning,
-                stacklevel=2
-            )
-            return FieldDefinitionChoiceManager.get_queryset(self)
-
-    def construct(self):
-        return self.get_queryset().construct()