diff options
| author | Tom Christie | 2012-05-22 01:19:55 -0700 |
|---|---|---|
| committer | Tom Christie | 2012-05-22 01:19:55 -0700 |
| commit | 9dbaac3182aa8e5c322e25513cd2e3d2bf0af1e2 (patch) | |
| tree | 30f50ab0afc0691c41f33fb6f3bcc5d5aef9e623 | |
| parent | 0c82e4b57549ed2d08bfb782cd99d4b71fd91eb7 (diff) | |
| parent | b689db17b3c1ef5a2bca3a7fa90d3381bd5ba4fe (diff) | |
| download | django-rest-framework-9dbaac3182aa8e5c322e25513cd2e3d2bf0af1e2.tar.bz2 | |
Merge pull request #210 from max-arnold/serialize-raw-queryset
Small patch to allow RawQuerySet serialization
| -rw-r--r-- | djangorestframework/serializer.py | 4 |
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): |
