diff options
| author | Tom Christie | 2015-01-30 14:00:25 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-01-30 14:00:25 +0000 |
| commit | 4ee4b4f2dc3cffd8246772bdf829a2a720493377 (patch) | |
| tree | 95b514483e901c10bdeee0d66e60430002d5101a /rest_framework/parsers.py | |
| parent | 8f33e39f62c59d06783dd3e6e7cf8d464ff08c5f (diff) | |
| parent | 7cf9dea7f905ea6869148a68b4fa96cad0a347e8 (diff) | |
| download | django-rest-framework-4ee4b4f2dc3cffd8246772bdf829a2a720493377.tar.bz2 | |
Merge master
Diffstat (limited to 'rest_framework/parsers.py')
| -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 7a51bb05..437d1339 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -152,7 +152,7 @@ class FileUploadParser(BaseParser): 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] |