Updating FieldDoesNotExist imports to all be django.core.exceptions. (#5581)

CONTRIBUTORS.rst

@@ -408,6 +408,7 @@ Contributors
 * Dawn Wages
 * Jacob Topp-Mugglestone
 * Brian Whitton
+* Tim White
 
 Translators
 ===========

wagtail/admin/edit_handlers.py

@@ -2,8 +2,7 @@ import functools
 import re
 
 from django import forms
-from django.core.exceptions import ImproperlyConfigured
-from django.db.models.fields import FieldDoesNotExist
+from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured
 from django.forms.formsets import DELETION_FIELD_NAME, ORDERING_FIELD_NAME
 from django.forms.models import fields_for_model
 from django.template.loader import render_to_string

wagtail/contrib/modeladmin/views.py

@@ -7,10 +7,9 @@ from django.contrib.admin.utils import (
     get_fields_from_path, label_for_field, lookup_needs_distinct, prepare_lookup_value, quote, unquote)
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import (
-    ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied, SuspiciousOperation)
+    FieldDoesNotExist, ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied, SuspiciousOperation)
 from django.core.paginator import InvalidPage, Paginator
 from django.db import models
-from django.db.models.fields import FieldDoesNotExist
 from django.db.models.fields.related import ManyToManyField, OneToOneRel
 from django.shortcuts import get_object_or_404, redirect
 from django.template.defaultfilters import filesizeformat

wagtail/search/backends/db.py

@@ -1,6 +1,7 @@
 from collections import OrderedDict
 from warnings import warn
 
+from django.core.exceptions import FieldDoesNotExist
 from django.db import models
 from django.db.models import Count
 from django.db.models.expressions import Value
@@ -30,7 +31,7 @@ class DatabaseSearchQueryCompiler(BaseSearchQueryCompiler):
         for field_name in fields_names:
             try:
                 model._meta.get_field(field_name)
-            except models.fields.FieldDoesNotExist:
+            except FieldDoesNotExist:
                 continue
             else:
                 yield field_name

wagtail/search/index.py

@@ -3,8 +3,8 @@ import logging
 
 from django.apps import apps
 from django.core import checks
+from django.core.exceptions import FieldDoesNotExist
 from django.db import models
-from django.db.models.fields import FieldDoesNotExist
 from django.db.models.fields.related import ForeignObjectRel, OneToOneRel, RelatedField
 
 from modelcluster.fields import ParentalManyToManyField