From f8a1256b1c006ee9ab46645a11ef19123b429a56 Mon Sep 17 00:00:00 2001
From: Mark Aaron Shirley
Date: Fri, 21 Dec 2012 11:33:01 -0800
Subject: Update RelatedField#field_from_native coding style

---
 rest_framework/fields.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 1059df91..dd90c3f8 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -351,13 +351,13 @@ class RelatedField(WritableField):
         if self.read_only:
             return
 
-        if field_name not in data and self.required:
-            raise ValidationError(self.error_messages['required'])
-        elif field_name not in data:
+        try:
+            value = data[field_name]
+        except KeyError:
+            if self.required:
+                raise ValidationError(self.error_messages['required'])
             return
 
-        value = data.get(field_name)
-
         if value in (None, '') and not self.null:
             raise ValidationError('Value may not be null')
         elif value in (None, '') and self.null:
-- 
cgit v1.2.3