Merge pull request #2399 from askholme/master

Fix for FileUploadParser with 3.x

Author: tomchristie

rest_framework/parsers.py

@@ -277,7 +277,7 @@ def parse(self, stream, media_type=None, parser_context=None):
         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")