From 20fa48ec98b579f75c035b09e67147b7d9c4cb6d Mon Sep 17 00:00:00 2001 From: David Henderson Date: Fri, 14 Dec 2012 10:01:42 +0000 Subject: [PATCH] Fixed failing test --- rest_framework/serializers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index acda833f0..83640254a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -3,6 +3,7 @@ import datetime import types from decimal import Decimal from django.db import models +from django.db.models.query import QuerySet from django.forms import widgets from django.utils.datastructures import SortedDict from rest_framework.compat import get_concrete_model @@ -283,7 +284,7 @@ class BaseSerializer(Field): """ Serialize objects -> primitives. """ - if hasattr(obj, '__iter__') and not hasattr(obj, '__dict__'): + if hasattr(obj, '__iter__') and (isinstance(obj, QuerySet) or not hasattr(obj, '__dict__')): return [self.convert_object(item) for item in obj] return self.convert_object(obj)