encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-02 20:54:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2453 from alexsdutton/data-and-files-none-data

Browse Source 
Pass {} as data to DataAndFiles, as it ends up in a MergeDict
This commit is contained in:
Tom Christie 2015-01-23 18:03:40 +00:00
commit 0cb5acee75
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/parsers.py
View File

@ -250,7 +250,7 @@ class FileUploadParser(BaseParser):
None, None,
encoding) encoding)
if result is not None: if result is not None:
return DataAndFiles(None, {'file': result[1]}) return DataAndFiles({}, {'file': result[1]})
# This is the standard case. # This is the standard case.
possible_sizes = [x.chunk_size for x in upload_handlers if x.chunk_size] possible_sizes = [x.chunk_size for x in upload_handlers if x.chunk_size]