diff options
| author | Danilo Bargen | 2015-02-25 16:20:45 +0100 | 
|---|---|---|
| committer | Danilo Bargen | 2015-02-25 18:54:47 +0100 | 
| commit | 86c5fa240131fe20121db707b0324a32967987ab (patch) | |
| tree | 8a72cab83e79eafe221fcfb32b28556bd4930ef5 /rest_framework/serializers.py | |
| parent | 5688d8b73648c67fbe5ea003916dae04a7c5bba0 (diff) | |
| download | django-rest-framework-86c5fa240131fe20121db707b0324a32967987ab.tar.bz2 | |
Force-evaluate querysets (see #2602)
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 9475e119..2eef6eeb 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -13,6 +13,7 @@ response content is handled by parsers and renderers.  from __future__ import unicode_literals  from django.db import models  from django.db.models.fields import FieldDoesNotExist, Field as DjangoModelField +from django.db.models import query  from django.utils.translation import ugettext_lazy as _  from rest_framework.compat import postgres_fields, unicode_to_repr  from rest_framework.utils import model_meta @@ -562,7 +563,7 @@ class ListSerializer(BaseSerializer):          """          # Dealing with nested relationships, data can be a Manager,          # so, first get a queryset from the Manager if needed -        iterable = data.all() if isinstance(data, models.Manager) else data +        iterable = data.all() if isinstance(data, (models.Manager, query.QuerySet)) else data          return [              self.child.to_representation(item) for item in iterable          ] | 
