diff options
| author | Tom Christie | 2012-11-01 02:12:20 -0700 |
|---|---|---|
| committer | Tom Christie | 2012-11-01 02:12:20 -0700 |
| commit | 204db7bdaa59cd17f762d6cf0e6a8623c2cc9939 (patch) | |
| tree | 337072bbbb550b4ddb83071b93ee04f2a73a5006 /rest_framework/fields.py | |
| parent | 027c9079f62322fe933bdfd4438f23cf4848e3cc (diff) | |
| parent | 756297ad1d07f56459471bff041828850ace0496 (diff) | |
| download | django-rest-framework-204db7bdaa59cd17f762d6cf0e6a8623c2cc9939.tar.bz2 | |
Merge pull request #349 from ZestCore/master
Documentation Fix for Auth/Throttling API guide + 'from_native' bug
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 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) |