aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorTom Christie2012-11-06 11:01:53 +0000
committerTom Christie2012-11-06 11:01:53 +0000
commitd9be6140dcb375f4b6a0e24947494e0537e4b443 (patch)
treed2d53dd9531cb68e2978696399a02c4694bafe8a /rest_framework/fields.py
parent0d2377c1480f3270a538de166be950ab4a0b09c8 (diff)
downloaddjango-rest-framework-d9be6140dcb375f4b6a0e24947494e0537e4b443.tar.bz2
More defensive coding. Refs: #348
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 65d7def5..e194690d 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -212,10 +212,10 @@ class ModelField(WritableField):
super(ModelField, self).__init__(*args, **kwargs)
def from_native(self, value):
- try:
- rel = self.model_field.rel
+ rel = getattr(self.model_field, "rel", None)
+ if rel is not None:
return rel.to._meta.get_field(rel.field_name).to_python(value)
- except:
+ else:
return self.model_field.to_python(value)
def field_to_native(self, obj, field_name):