Fixed #21414 -- Removed RelatedObject and deprecated Field.related.

2 files changed, 3 insertions, 4 deletions

diff --git a/django/db/models/sql/datastructures.py b/django/db/models/sql/datastructures.py
index fc5ffc1790..a245e451d6 100644
--- a/django/db/models/sql/datastructures.py
+++ b/django/db/models/sql/datastructures.py
@@ -55,7 +55,7 @@ class Join(object):
         # A list of 2-tuples to use in the ON clause of the JOIN.
         # Each 2-tuple will create one join condition in the ON clause.
         self.join_cols = join_field.get_joining_columns()
-        # Along which field (or RelatedObject in the reverse join case)
+        # Along which field (or ForeignObjectRel in the reverse join case)
         self.join_field = join_field
         # Is this join nullabled?
         self.nullable = nullable
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index cad6372eea..44ece3fdd5 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -13,12 +13,11 @@ import warnings
 
 from django.core.exceptions import FieldError
 from django.db import connections, DEFAULT_DB_ALIAS
+from django.db.models.aggregates import Count
 from django.db.models.constants import LOOKUP_SEP
 from django.db.models.expressions import Col, Ref
 from django.db.models.fields import FieldDoesNotExist
-from django.db.models.query_utils import Q, refs_aggregate
-from django.db.models.related import PathInfo
-from django.db.models.aggregates import Count
+from django.db.models.query_utils import PathInfo, Q, refs_aggregate
 from django.db.models.sql.constants import (QUERY_TERMS, ORDER_DIR, SINGLE,
         ORDER_PATTERN, SelectInfo, INNER, LOUTER)
 from django.db.models.sql.datastructures import (