diff options
| author | Alexander Dutton | 2015-01-23 16:48:23 +0000 |
|---|---|---|
| committer | Alexander Dutton | 2015-01-23 16:52:24 +0000 |
| commit | a1fa7218ebc4a77a3912c42221927b1846f555fd (patch) | |
| tree | c6550ffd4f4d6bd4a388d3bde30f27999459198d /rest_framework/parsers.py | |
| parent | b07d931261c2e9f722fb2de63ab17f088142b6f1 (diff) | |
| download | django-rest-framework-a1fa7218ebc4a77a3912c42221927b1846f555fd.tar.bz2 | |
Pass {} as data to DataAndFiles, as it ends up in a MergeDict
In the same vein as #2399.
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 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] |