From 59cce01b3359aa009e697a99eabbf2ef322b28e2 Mon Sep 17 00:00:00 2001
From: Philip Douglas
Date: Thu, 12 Sep 2013 16:03:20 +0100
Subject: Fix error when serializer gets files but no data

---
 rest_framework/serializers.py      |  2 +-
 rest_framework/tests/test_files.py | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'rest_framework')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index a63c7f6c..778e72d1 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -156,7 +156,7 @@ class BaseSerializer(WritableField):
 
         self.context = context or {}
 
-        self.init_data = data
+        self.init_data = data or {}
         self.init_files = files
         self.object = instance
         self.fields = self.get_fields()
diff --git a/rest_framework/tests/test_files.py b/rest_framework/tests/test_files.py
index c13c38b8..127e379e 100644
--- a/rest_framework/tests/test_files.py
+++ b/rest_framework/tests/test_files.py
@@ -80,3 +80,16 @@ class FileSerializerTests(TestCase):
         serializer = UploadedFileSerializer(data={'created': now, 'file': 'abc'})
         self.assertFalse(serializer.is_valid())
         self.assertEqual(serializer.errors, {'file': [errmsg]})
+
+    def test_validation_with_no_data(self):
+        """
+        Validation should still function when no data dictionary is provided.
+        """
+        now = datetime.datetime.now()
+        file = BytesIO(six.b('stuff'))
+        file.name = 'stuff.txt'
+        file.size = len(file.getvalue())
+        uploaded_file = UploadedFile(file=file, created=now)
+
+        serializer = UploadedFileSerializer(files={'file': file})
+        self.assertFalse(serializer.is_valid())
\ No newline at end of file
-- 
cgit v1.2.3


From 6e4bdb55969171c87296aba9711dbc77f8a1e366 Mon Sep 17 00:00:00 2001
From: Philip Douglas
Date: Thu, 12 Sep 2013 16:04:33 +0100
Subject: Add missing newline at the end of test file

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

(limited to 'rest_framework')

diff --git a/rest_framework/tests/test_files.py b/rest_framework/tests/test_files.py
index 127e379e..78f4cf42 100644
--- a/rest_framework/tests/test_files.py
+++ b/rest_framework/tests/test_files.py
@@ -92,4 +92,4 @@ class FileSerializerTests(TestCase):
         uploaded_file = UploadedFile(file=file, created=now)
 
         serializer = UploadedFileSerializer(files={'file': file})
-        self.assertFalse(serializer.is_valid())
\ No newline at end of file
+        self.assertFalse(serializer.is_valid())
-- 
cgit v1.2.3


From 272a6abf91c51b44781d27af5352c7e36c8fa91c Mon Sep 17 00:00:00 2001
From: Philip Douglas
Date: Fri, 13 Sep 2013 10:46:24 +0100
Subject: Try a more localised fix to the data=None problem

---
 rest_framework/fields.py      | 1 +
 rest_framework/serializers.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 210c2537..0c3817b5 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -306,6 +306,7 @@ class WritableField(Field):
             return
 
         try:
+            data = data or {}
             if self.use_files:
                 files = files or {}
                 try:
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 778e72d1..a63c7f6c 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -156,7 +156,7 @@ class BaseSerializer(WritableField):
 
         self.context = context or {}
 
-        self.init_data = data or {}
+        self.init_data = data
         self.init_files = files
         self.object = instance
         self.fields = self.get_fields()
-- 
cgit v1.2.3