From 806b31b88044f816defc11717e75af9d2fd50c01 Mon Sep 17 00:00:00 2001 From: yudori Date: Sun, 22 Jan 2017 22:47:38 +0100 Subject: [PATCH] fix parser_context bug in MultiPartParser --- rest_framework/parsers.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 238382364..2f0eb6b15 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -98,12 +98,16 @@ class MultiPartParser(BaseParser): `.data` will be a `QueryDict` containing all the form parameters. `.files` will be a `QueryDict` containing all the form files. """ + meta = {} + upload_handlers = [] parser_context = parser_context or {} - request = parser_context['request'] - encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET) - meta = request.META.copy() + if 'request' in parser_context: + request = parser_context['request'] + meta = request.META.copy() + upload_handlers = request.upload_handlers + meta['CONTENT_TYPE'] = media_type - upload_handlers = request.upload_handlers + encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET) try: parser = DjangoMultiPartParser(meta, stream, upload_handlers, encoding)