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

Fixed convert bytes to str

Browse Source 
Use compact function for convert
This commit is contained in:
Vladislav Vlastovskiy 2014-04-14 13:21:24 +04:00
parent d1f4dfca20
commit 3fe0383572
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/parsers.py
View File

@ -10,8 +10,7 @@ from django.core.files.uploadhandler import StopFutureHandlers
from django.http import QueryDict from django.http import QueryDict
from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter
from django.utils.encoding import force_str from rest_framework.compat import etree, six, yaml, force_text
from rest_framework.compat import etree, six, yaml
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
from rest_framework import renderers from rest_framework import renderers
import json import json
@ -290,6 +289,6 @@ class FileUploadParser(BaseParser):
try: try:
meta = parser_context['request'].META meta = parser_context['request'].META
disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8')) disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))
return force_str(disposition[1]['filename']) return force_text(disposition[1]['filename'])
except (AttributeError, KeyError): except (AttributeError, KeyError):
pass pass