diff options
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 fa02ecf1..ccb82f03 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -5,6 +5,7 @@ They give us a generic way of being able to handle various media types  on the request, such as form content or json encoded data.  """  from __future__ import unicode_literals +  from django.conf import settings  from django.core.files.uploadhandler import StopFutureHandlers  from django.http import QueryDict @@ -132,7 +133,7 @@ class MultiPartParser(BaseParser):              data, files = parser.parse()              return DataAndFiles(data, files)          except MultiPartParserError as exc: -            raise ParseError('Multipart form parse error - %s' % str(exc)) +            raise ParseError('Multipart form parse error - %s' % six.text_type(exc))  class XMLParser(BaseParser): | 
