Fixed #9104 -- Moved FieldDoesNotExist to core.exceptions

tests/annotations/tests.py

@@ -2,12 +2,11 @@ from __future__ import unicode_literals
 import datetime
 from decimal import Decimal
 
-from django.core.exceptions import FieldError
+from django.core.exceptions import FieldDoesNotExist, FieldError
 from django.db.models import (
     Sum, Count,
     F, Value, Func,
     IntegerField, BooleanField, CharField)
-from django.db.models.fields import FieldDoesNotExist
 from django.test import TestCase
 from django.utils import six
 

tests/model_meta/test.py

@@ -1,7 +1,7 @@
 from django import test
-
-from django.db.models.fields import related, CharField, Field, FieldDoesNotExist
 from django.contrib.contenttypes.fields import GenericRelation
+from django.core.exceptions import FieldDoesNotExist
+from django.db.models.fields import related, CharField, Field
 
 from .models import (
     AbstractPerson, BasePerson, Person, Relating, Relation