summaryrefslogtreecommitdiff
path: root/django/db/models/query_utils.py
diff options
context:
space:
mode:
authorAnssi Kääriäinen <anssi.kaariainen@thl.fi>2015-02-26 16:19:17 +0200
committerTim Graham <timograham@gmail.com>2015-03-25 08:16:12 -0400
commit8f30556329b64005d63b66859a74752a0b261315 (patch)
tree73b5ac8d3be457f8061aa270437c9a957d2d622c /django/db/models/query_utils.py
parentf9c70bb3a1239ed1e04a769fd323286a5b1fde20 (diff)
Renamed Field.rel attribute to remote_field
Field.rel is now deprecated. Rel objects have now also remote_field attribute. This means that self == self.remote_field.remote_field. In addition, made the Rel objects a bit more like Field objects. Still, marked ManyToManyFields as null=True.
Diffstat (limited to 'django/db/models/query_utils.py')
-rw-r--r--django/db/models/query_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py
index 35e3fe58bc..d8bf9b8e67 100644
--- a/django/db/models/query_utils.py
+++ b/django/db/models/query_utils.py
@@ -181,9 +181,9 @@ def select_related_descend(field, restricted, requested, load_fields, reverse=Fa
* load_fields - the set of fields to be loaded on this model
* reverse - boolean, True if we are checking a reverse select related
"""
- if not field.rel:
+ if not field.remote_field:
return False
- if field.rel.parent_link and not reverse:
+ if field.remote_field.parent_link and not reverse:
return False
if restricted:
if reverse and field.related_query_name() not in requested: