encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-25 23:50:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failing test

Browse Source
This commit is contained in:
David Henderson 2012-12-14 10:01:42 +00:00
parent 688229f1e0
commit 20fa48ec98
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/serializers.py
View File

@ -3,6 +3,7 @@ import datetime
import types import types
from decimal import Decimal from decimal import Decimal
from django.db import models from django.db import models
from django.db.models.query import QuerySet
from django.forms import widgets from django.forms import widgets
from django.utils.datastructures import SortedDict from django.utils.datastructures import SortedDict
from rest_framework.compat import get_concrete_model from rest_framework.compat import get_concrete_model
@ -283,7 +284,7 @@ class BaseSerializer(Field):
""" """
Serialize objects -> primitives. 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(item) for item in obj]
return self.convert_object(obj) return self.convert_object(obj)