Make FileUploadParser work with standard django API

Output from parsers ends up in a Django MergeDict and they exists elements to be dicts - not None

1 files changed, 1 insertions, 1 deletions

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 3e3395c0..401856ec 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -277,7 +277,7 @@ class FileUploadParser(BaseParser):
         for index, handler in enumerate(upload_handlers):
             file_obj = handler.file_complete(counters[index])
             if file_obj:
-                return DataAndFiles(None, {'file': file_obj})
+                return DataAndFiles({}, {'file': file_obj})
         raise ParseError("FileUpload parse error - "
                          "none of upload handlers can handle the stream")