From d474934d365291c28d5741898257cbdd5d0aa9ec Mon Sep 17 00:00:00 2001
From: Vladislav Vlastovskiy
Date: Mon, 14 Apr 2014 13:01:24 +0400
Subject: Fixed return type

From bytes to str---
 rest_framework/parsers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 703cefca..d49b17a4 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -10,6 +10,7 @@ from django.core.files.uploadhandler import StopFutureHandlers
 from django.http import QueryDict
 from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
 from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter
+from django.utils.encoding import force_str
 from rest_framework.compat import etree, six, yaml
 from rest_framework.exceptions import ParseError
 from rest_framework import renderers
@@ -289,6 +290,6 @@ class FileUploadParser(BaseParser):
         try:
             meta = parser_context['request'].META
             disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))
-            return disposition[1]['filename']
+            return force_str(disposition[1]['filename'])
         except (AttributeError, KeyError):
             pass
-- 
cgit v1.2.3