diff options
| author | Tom Christie | 2012-11-01 23:11:28 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-11-01 23:11:28 +0000 |
| commit | 36e21153fbc60579c49e46c3f6488ff7bcb1f6ff (patch) | |
| tree | 86097abd5482538c7c026dd233566026b6e6bcad /rest_framework/fields.py | |
| parent | d327c5f531b341ad980d20454211b02b87f34d0e (diff) | |
| parent | 600289a8153eb70542551bab00d59fb7ff0065f0 (diff) | |
| download | django-rest-framework-36e21153fbc60579c49e46c3f6488ff7bcb1f6ff.tar.bz2 | |
Merge master
Diffstat (limited to 'rest_framework/fields.py')
| -rw-r--r-- | rest_framework/fields.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 6d858087..b7d02234 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -212,9 +212,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) |