diff --git a/django_elasticsearch/managers.py b/django_elasticsearch/managers.py index edf2718..740f7b5 100644 --- a/django_elasticsearch/managers.py +++ b/django_elasticsearch/managers.py @@ -5,12 +5,17 @@ except ImportError: # python < 2.7 from django.utils import importlib +from django import VERSION as django_version from django.conf import settings try: from django.utils import importlib except: import importlib -from django.db.models import FieldDoesNotExist + +if django_version < (3, 1, 0): + from django.db.models import FieldDoesNotExist +else: + from django.core.exceptions import FieldDoesNotExist from django_elasticsearch.query import EsQueryset from django_elasticsearch.client import es_client diff --git a/django_elasticsearch/serializers.py b/django_elasticsearch/serializers.py index 474e64e..ba6f659 100644 --- a/django_elasticsearch/serializers.py +++ b/django_elasticsearch/serializers.py @@ -1,7 +1,13 @@ import json import datetime -from django.db.models import FieldDoesNotExist +from django import VERSION as django_version + +if django_version < (3, 1, 0): + from django.db.models import FieldDoesNotExist +else: + from django.core.exceptions import FieldDoesNotExist + from django.db.models.fields.related import ManyToManyField