diff options
| author | Tom Christie | 2015-01-23 18:03:40 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-01-23 18:03:40 +0000 |
| commit | 0cb5acee7594dd75fb56b4061c73beb6b57e7813 (patch) | |
| tree | de00c68257da630ff2ba4e405126a9d96c8c40a1 /rest_framework | |
| parent | 8f6d7f4a5a34a144700d943cb8fcf496d0d3734a (diff) | |
| parent | a1fa7218ebc4a77a3912c42221927b1846f555fd (diff) | |
| download | django-rest-framework-0cb5acee7594dd75fb56b4061c73beb6b57e7813.tar.bz2 | |
Merge pull request #2453 from alexsdutton/data-and-files-none-data
Pass {} as data to DataAndFiles, as it ends up in a MergeDict
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 ef72677c..1efab85b 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -250,7 +250,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] |