aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework
diff options
context:
space:
mode:
authorMax Arnold2012-05-22 12:39:50 +0700
committerMax Arnold2012-05-22 12:39:50 +0700
commitb689db17b3c1ef5a2bca3a7fa90d3381bd5ba4fe (patch)
treedf7417e923147cf89e1697f20fac87801e324867 /djangorestframework
parente53c819cc7a5567f2c29375550e9ff62ec20d472 (diff)
downloaddjango-rest-framework-b689db17b3c1ef5a2bca3a7fa90d3381bd5ba4fe.tar.bz2
Allow RawQuerySet serialization
Diffstat (limited to 'djangorestframework')
-rw-r--r--djangorestframework/serializer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/djangorestframework/serializer.py b/djangorestframework/serializer.py
index 5dea37e8..9481eeff 100644
--- a/djangorestframework/serializer.py
+++ b/djangorestframework/serializer.py
@@ -2,7 +2,7 @@
Customizable serialization.
"""
from django.db import models
-from django.db.models.query import QuerySet
+from django.db.models.query import QuerySet, RawQuerySet
from django.utils.encoding import smart_unicode, is_protected_type, smart_str
import inspect
@@ -261,7 +261,7 @@ class Serializer(object):
if isinstance(obj, (dict, models.Model)):
# Model instances & dictionaries
return self.serialize_model(obj)
- elif isinstance(obj, (tuple, list, set, QuerySet, types.GeneratorType)):
+ elif isinstance(obj, (tuple, list, set, QuerySet, RawQuerySet, types.GeneratorType)):
# basic iterables
return self.serialize_iter(obj)
elif isinstance(obj, models.Manager):