aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorOtto Yiu2012-10-31 21:40:20 -0700
committerOtto Yiu2012-10-31 21:40:20 -0700
commit756297ad1d07f56459471bff041828850ace0496 (patch)
tree337072bbbb550b4ddb83071b93ee04f2a73a5006 /rest_framework/fields.py
parent96dc9ce1ad15275944a5fd9389843a30c6aff3c6 (diff)
downloaddjango-rest-framework-756297ad1d07f56459471bff041828850ace0496.tar.bz2
fix 'from_native' method when rel is None
'NoneType' object has no attribute 'to'
Diffstat (limited to 'rest_framework/fields.py')
-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)