diff options
| author | Tom Christie | 2012-09-28 14:28:50 +0100 | 
|---|---|---|
| committer | Tom Christie | 2012-09-28 14:28:50 +0100 | 
| commit | e003cc91b627a64b6d4d364f9de936ed1bec03e1 (patch) | |
| tree | 5b61186429755372e9e117f16aa8edef8553d764 /rest_framework/serializers.py | |
| parent | 84f775803994ccd82671dd4a6f9b4d87aa36dc31 (diff) | |
| download | django-rest-framework-e003cc91b627a64b6d4d364f9de936ed1bec03e1.tar.bz2 | |
Get test-only models properly working
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 4d5958d2..986d4225 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -114,7 +114,7 @@ class BaseSerializer(Field):          Returns the complete set of fields for the object as a dict.          This will be the set of any explicitly declared fields, -        plus the set of fields returned by get_default_fields(). +        plus the set of fields returned by default_fields().          """          ret = SortedDict() @@ -234,7 +234,7 @@ class BaseSerializer(Field):              return dict([(key, self.to_native(val))                           for (key, val) in obj.items()])          elif hasattr(obj, '__iter__'): -            return (self.to_native(item) for item in obj) +            return [self.to_native(item) for item in obj]          return self.convert_object(obj)      def from_native(self, data):  | 
