From 71ccab593b7ea7e3a1ab5dd971365c57822454ae Mon Sep 17 00:00:00 2001
From: Joel Marcotte
Date: Sat, 15 Dec 2012 10:35:06 -0500
Subject: Fix for JSON integer match to a ChoiceField

---
 rest_framework/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/fields.py')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index da588082..903c384e 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -794,7 +794,7 @@ class ChoiceField(WritableField):
                     if value == smart_unicode(k2):
                         return True
             else:
-                if value == smart_unicode(k):
+                if value == smart_unicode(k) or value == k:
                     return True
         return False
 
-- 
cgit v1.2.3


From 6f25181979084e769658748ea342ff088ad245c0 Mon Sep 17 00:00:00 2001
From: Joel Marcotte
Date: Sat, 15 Dec 2012 16:45:04 -0500
Subject: Reverting commit to previous state to see if the test is only
 relevant to django 1.5b2

---
 rest_framework/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/fields.py')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 903c384e..da588082 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -794,7 +794,7 @@ class ChoiceField(WritableField):
                     if value == smart_unicode(k2):
                         return True
             else:
-                if value == smart_unicode(k) or value == k:
+                if value == smart_unicode(k):
                     return True
         return False
 
-- 
cgit v1.2.3


From 262d9c248918d1e9a2e6ee8008aca94e2e23dd82 Mon Sep 17 00:00:00 2001
From: Joel Marcotte
Date: Sat, 15 Dec 2012 16:52:28 -0500
Subject: Final commit to restore the fix

Signed-off-by: Joel Marcotte <skaner@gmail.com>
---
 rest_framework/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/fields.py')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index da588082..903c384e 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -794,7 +794,7 @@ class ChoiceField(WritableField):
                     if value == smart_unicode(k2):
                         return True
             else:
-                if value == smart_unicode(k):
+                if value == smart_unicode(k) or value == k:
                     return True
         return False
 
-- 
cgit v1.2.3


From 6611514134b9e48f7e08322b42870eae1b5e8e6d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 18 Dec 2012 19:20:10 +0000
Subject: Whitespace

---
 rest_framework/fields.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'rest_framework/fields.py')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index d3ef8f77..2060e3e7 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -384,6 +384,7 @@ class ManyRelatedMixin(object):
         else:
             if value == ['']:
                 value = []
+
         into[field_name] = [self.from_native(item) for item in value]
 
 
-- 
cgit v1.2.3


From 5c680c36e435ffa29ba6ed5f439d22ea4e849c67 Mon Sep 17 00:00:00 2001
From: Mark Aaron Shirley
Date: Wed, 19 Dec 2012 09:26:40 -0800
Subject: Check if RelatedField is required.

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

(limited to 'rest_framework/fields.py')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 2060e3e7..b0dfdce8 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -351,6 +351,11 @@ 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:
+            return
+
         value = data.get(field_name)
 
         if value in (None, '') and not self.null:
-- 
cgit v1.2.3


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/fields.py')

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