Merge pull request #2453 from alexsdutton/data-and-files-none-data

Pass {} as data to DataAndFiles, as it ends up in a MergeDict

Author: tomchristie

rest_framework/parsers.py

@@ -250,7 +250,7 @@ def parse(self, stream, media_type=None, parser_context=None):
                                               None,
                                               encoding)
             if result is not None:
-                return DataAndFiles(None, {'file': result[1]})
+                return DataAndFiles({}, {'file': result[1]})
 
         # This is the standard case.
         possible_sizes = [x.chunk_size for x in upload_handlers if x.chunk_size]