diff options
| author | Tom Christie | 2015-01-12 12:21:35 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-01-12 12:21:35 +0000 |
| commit | fb0a434f9b8b2971d6d3d03d34513926de4c71ce (patch) | |
| tree | ee97f68fa274ba4433351bd2c72914bc81375ffd /rest_framework | |
| parent | 69fea562456761c98ed3c58d14aa3e236a653efc (diff) | |
| parent | d6bff10f9829b3cef1c2773c303b172a8c7ec525 (diff) | |
| download | django-rest-framework-fb0a434f9b8b2971d6d3d03d34513926de4c71ce.tar.bz2 | |
Merge pull request #2399 from askholme/master
Fix for FileUploadParser with 3.x
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/parsers.py | 2 |
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") |