diff options
| author | Vladislav Vlastovskiy | 2014-04-14 13:01:24 +0400 | 
|---|---|---|
| committer | Vladislav Vlastovskiy | 2014-04-14 13:01:24 +0400 | 
| commit | d474934d365291c28d5741898257cbdd5d0aa9ec (patch) | |
| tree | 1e741f6650578607e33d72d61552c2fd2f6e97f7 /rest_framework/parsers.py | |
| parent | f6329b7b5df4b5011d318c25cb7ca288dc22ea42 (diff) | |
| download | django-rest-framework-d474934d365291c28d5741898257cbdd5d0aa9ec.tar.bz2 | |
Fixed return type
From bytes to str
Diffstat (limited to 'rest_framework/parsers.py')
| -rw-r--r-- | rest_framework/parsers.py | 3 | 
1 files changed, 2 insertions, 1 deletions
| 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 | 
