From db9672d3048eebb3d3c3fb2b4a345e17b5aa23cc Mon Sep 17 00:00:00 2001
From: Alex Burgel
Date: Wed, 24 Jul 2013 17:24:29 -0400
Subject: Add support for removing field files by sending an empty string

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

(limited to 'rest_framework/fields.py')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index f9931887..9ba5c0eb 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -307,7 +307,10 @@ class WritableField(Field):
         try:
             if self.use_files:
                 files = files or {}
-                native = files[field_name]
+                try:
+                    native = files[field_name]
+                except KeyError:
+                    native = data[field_name]
             else:
                 native = data[field_name]
         except KeyError:
-- 
cgit v1.2.3


From 11071499a777ecfee6edfb7e92ecf9a12d35eeb7 Mon Sep 17 00:00:00 2001
From: Mathieu Pillard
Date: Thu, 29 Aug 2013 18:10:47 +0200
Subject: Make ChoiceField.from_native() follow IntegerField behaviour on empty
 values

---
 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 3e0ca1a1..210c2537 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -514,6 +514,11 @@ class ChoiceField(WritableField):
                     return True
         return False
 
+    def from_native(self, value):
+        if value in validators.EMPTY_VALUES:
+            return None
+        return super(ChoiceField, self).from_native(value)
+
 
 class EmailField(CharField):
     type_name = 'EmailField'
-- 
cgit v1.2.3