aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOsiloke Emoekpere2012-11-04 13:20:10 -0500
committerOsiloke Emoekpere2012-11-04 13:20:10 -0500
commite74772b8a6d0d9d218946a6bc8411afe8e77e0bb (patch)
tree1d72f10b0002d5f3197dee643df0177c4d87e81c
parent027c9079f62322fe933bdfd4438f23cf4848e3cc (diff)
downloaddjango-rest-framework-e74772b8a6d0d9d218946a6bc8411afe8e77e0bb.tar.bz2
This accounts for none(null) values of rel.to when converting model fields from native
-rw-r--r--rest_framework/fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 1d6d760e..73c8f72b 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -211,9 +211,9 @@ class ModelField(WritableField):
def from_native(self, value):
try:
rel = self.model_field.rel
+ return rel.to._meta.get_field(rel.field_name).to_python(value)
except:
return self.model_field.to_python(value)
- return rel.to._meta.get_field(rel.field_name).to_python(value)
def field_to_native(self, obj, field_name):
value = self.model_field._get_val_from_obj(obj)