Django 3 support

Author: nichoski

hvad/admin.py

@@ -17,7 +17,7 @@
 from django.template.loader import select_template
 from django.urls import reverse
 from django.utils.encoding import force_text, iri_to_uri
-from django.utils.functional import curry
+from functools import partial
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language, ugettext_lazy as _
 from urllib.parse import urlencode, urlparse
@@ -155,7 +155,7 @@ def get_form(self, request, obj=None, change=False, **kwargs):
                 tuple(kwargs.pop("exclude", ())) +
                 tuple(self.get_readonly_fields(request, obj) or ())
         )
-        old_formfield_callback = curry(self.formfield_for_dbfield, request=request)
+        old_formfield_callback = partial(self.formfield_for_dbfield, request=request)
         defaults = {
             "form": self.form,
             "fields": fields,
@@ -385,7 +385,7 @@ def get_formset(self, request, obj=None, **kwargs):
             "fk_name": self.fk_name,
             "fields": fields,
             "exclude": exclude or None,
-            "formfield_callback": curry(self.formfield_for_dbfield, request=request),
+            "formfield_callback": partial(self.formfield_for_dbfield, request=request),
             "extra": self.extra,
             "max_num": self.max_num,
             "can_delete": self.can_delete,
@@ -420,7 +420,7 @@ def get_form(self, request, obj=None, **kwargs):
                 tuple(kwargs.pop("exclude", ())) +
                 self.get_readonly_fields(request, obj)
         )
-        old_formfield_callback = curry(self.formfield_for_dbfield, request=request)
+        old_formfield_callback = partial(self.formfield_for_dbfield, request=request)
         defaults = {
             "form": self.form,
             "fields": fields,

hvad/contrib/restframework/serializers.py

@@ -5,7 +5,7 @@
     TranslatableModelSerializer             - Serializer that handles translatable fields
     HyperlinkedTranslatableModelSerializer  - Hyperlinked serializer that handles translatable fields
 """
-from django.db.models.fields import FieldDoesNotExist
+from django.core.exceptions import FieldDoesNotExist
 from django.utils.translation import get_language, ugettext_lazy as _
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError

hvad/models.py

@@ -5,7 +5,7 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models, router, transaction
 from django.db.models.base import ModelBase
-from django.db.models.fields import FieldDoesNotExist
+from django.core.exceptions import FieldDoesNotExist
 from django.db.models.manager import Manager
 from django.db.models.signals import class_prepared
 from django.utils.translation import get_language

hvad/query.py

@@ -6,7 +6,8 @@
     a new Django version comes out.
 """
 import django
-from django.db.models import Q, FieldDoesNotExist
+from django.db.models import Q
+from django.core.exceptions import FieldDoesNotExist
 from django.db.models.expressions import Expression, Col
 from django.db.models.sql.where import AND
 from collections import namedtuple

hvad/utils.py

@@ -2,7 +2,7 @@
     Mostly intended for internal use and third-party modules.
 """
 import django
-from django.db.models.fields import FieldDoesNotExist
+from django.core.exceptions import FieldDoesNotExist
 from django.utils.translation import get_language, get_language_info as original_get_language_info
 from hvad.exceptions import WrongManager
 from hvad.settings import hvad_settings