Support django-elasticsearch-dsl v6.4.2

DocType was replaced with Document as top level import. django-es/django-elasticsearch-dsl#185
jayvdb · Jan 1, 2021 · 7cf2c14 · 7cf2c14
1 parent f976da8
commit 7cf2c14
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/bluebottle/activities/documents.py b/bluebottle/activities/documents.py
@@ -1,6 +1,7 @@
 from builtins import str
 from builtins import object
-from django_elasticsearch_dsl import DocType, fields
+
+from bluebottle.initiatives.documents import DocType, fields
 
 from bluebottle.utils.documents import MultiTenantIndex
 from bluebottle.activities.models import Activity

diff --git a/bluebottle/initiatives/documents.py b/bluebottle/initiatives/documents.py
@@ -1,5 +1,10 @@
 from builtins import object
-from django_elasticsearch_dsl import DocType, fields
+
+try:
+    from django_elasticsearch_dsl.documents import DocType
+except ImportError:
+    from django_elasticsearch_dsl import DocType
+from django_elasticsearch_dsl import fields
 
 from bluebottle.time_based.models import PeriodActivity, DateActivity
 from bluebottle.utils.documents import MultiTenantIndex