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

Fix multipart error when used via content-type overloading

Browse Source
This commit is contained in:
Tom Christie 2013-08-29 21:24:29 +01:00
parent 19f9adacb2
commit 2247fd68e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/parsers.py
View File

@ -122,7 +122,8 @@ class MultiPartParser(BaseParser):
parser_context = parser_context or {} parser_context = parser_context or {}
request = parser_context['request'] request = parser_context['request']
encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET) encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET)
meta = request.META meta = request.META.copy()
meta['CONTENT_TYPE'] = media_type
upload_handlers = request.upload_handlers upload_handlers = request.upload_handlers
try: try:
@ -130,7 +131,7 @@ class MultiPartParser(BaseParser):
data, files = parser.parse() data, files = parser.parse()
return DataAndFiles(data, files) return DataAndFiles(data, files)
except MultiPartParserError as exc: except MultiPartParserError as exc:
raise ParseError('Multipart form parse error - %s' % six.u(exc.strerror)) raise ParseError('Multipart form parse error - %s' % str(exc))
class XMLParser(BaseParser): class XMLParser(BaseParser):