From e74772b8a6d0d9d218946a6bc8411afe8e77e0bb Mon Sep 17 00:00:00 2001 From: Osiloke Emoekpere Date: Sun, 4 Nov 2012 13:20:10 -0500 Subject: [PATCH] This accounts for none(null) values of rel.to when converting model fields from native --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 1d6d760e3..73c8f72b9 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)