diff options
| author | Collin Anderson <cmawebsite@gmail.com> | 2014-10-27 21:36:47 -0400 |
|---|---|---|
| committer | Anssi Kääriäinen <akaariai@gmail.com> | 2014-10-28 10:13:50 +0200 |
| commit | ae7cb992bca5d211c9456487feb21b84387006eb (patch) | |
| tree | 66e172fa243d86aed830aae454df6121dd21830b /django/db/models/sql | |
| parent | 00aa562884a418c4ee20e223ab82c3455997ee7d (diff) | |
Fixed #23721 -- check_related_objects without calling __iter__
Refs #14334
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/query.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index b6690e4526..4560989e60 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1102,12 +1102,11 @@ class Query(object): 'Cannot use QuerySet for "%s": Use a QuerySet for "%s".' % (value.model._meta.model_name, opts.object_name) ) + elif hasattr(value, '_meta'): + self.check_query_object_type(value, opts) elif hasattr(value, '__iter__'): for v in value: self.check_query_object_type(v, opts) - else: - # expecting single model instance here - self.check_query_object_type(value, opts) def build_lookup(self, lookups, lhs, rhs): lookups = lookups[:] |