From c5cc960511a2dbc341e6525bb55d9704e92cffca Mon Sep 17 00:00:00 2001 From: roveil Date: Mon, 6 Dec 2021 11:21:53 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20django=203.1=20=D0=B8=20=D0=B2=D1=8B=D1=88=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- django_elasticsearch/managers.py | 7 ++++++- django_elasticsearch/serializers.py | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) 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