From 756297ad1d07f56459471bff041828850ace0496 Mon Sep 17 00:00:00 2001
From: Otto Yiu
Date: Wed, 31 Oct 2012 21:40:20 -0700
Subject: fix 'from_native' method when rel is None

'NoneType' object has no attribute 'to'
---
 rest_framework/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework')

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)
-- 
cgit v1.2.3