aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2012-11-02 14:08:21 -0700
committerTom Christie2012-11-02 14:08:21 -0700
commitdafbbdc5bf781267a824f740791d5e585e4d93d9 (patch)
tree5cd19df0fc6bfb35b30724b40511bb55486d4ba8
parentb9bff2a984767c4258cad4860addc53a9623bb11 (diff)
parenta6806f03078fbdda598e10260f9d9bcdf07c1dce (diff)
downloaddjango-rest-framework-dafbbdc5bf781267a824f740791d5e585e4d93d9.tar.bz2
Merge pull request #358 from jmagnusson/master
Return dictionaries as is
-rw-r--r--rest_framework/fields.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 375d7a46..515ccbcf 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -90,6 +90,8 @@ class Field(object):
return value
elif hasattr(value, '__iter__') and not isinstance(value, (dict, basestring)):
return [self.to_native(item) for item in value]
+ elif isinstance(value, dict):
+ return dict(map(self.to_native, (k, v)) for k, v in value.items())
return smart_unicode(value)
def attributes(self):