diff options
| author | Tom Christie | 2013-02-07 12:57:40 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-02-07 12:57:40 +0000 |
| commit | 670ac25b25a3c7fb54fca6aa9344b8250ab49edb (patch) | |
| tree | fdd12baeb96f10d8824d172553dbd6e469e8798d /rest_framework/serializers.py | |
| parent | 8113d661260834a91d91481f31860398cde9212d (diff) | |
| download | django-rest-framework-670ac25b25a3c7fb54fca6aa9344b8250ab49edb.tar.bz2 | |
Allow serializers to handle dicts as well as objects. Fixes #447.
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 7daeac41..a6dbf5d7 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -325,7 +325,7 @@ class BaseSerializer(Field): if self.many is not None: many = self.many else: - many = hasattr(obj, '__iter__') and not isinstance(obj, Page) + many = hasattr(obj, '__iter__') and not isinstance(obj, (Page, dict)) if many: return [self.to_native(item) for item in obj] @@ -343,7 +343,7 @@ class BaseSerializer(Field): if self.many is not None: many = self.many else: - many = hasattr(data, '__iter__') and not isinstance(data, dict) + many = hasattr(data, '__iter__') and not isinstance(data, (Page, dict)) # TODO: error data when deserializing lists if many: @@ -368,7 +368,7 @@ class BaseSerializer(Field): if self.many is not None: many = self.many else: - many = hasattr(obj, '__iter__') and not isinstance(obj, Page) + many = hasattr(obj, '__iter__') and not isinstance(obj, (Page, dict)) if many: self._data = [self.to_native(item) for item in obj] |