aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/parsers.py
diff options
context:
space:
mode:
authorTom Christie2013-08-28 21:52:56 +0100
committerTom Christie2013-08-28 21:52:56 +0100
commit18007d68464b0cfab970e2a60aed0d41c4de4dac (patch)
tree7964747ece4cebc71f1bd73be81a38dbd42408e4 /rest_framework/parsers.py
parent8d590ebfded0968e458f8e3a87efabec8384586e (diff)
downloaddjango-rest-framework-18007d68464b0cfab970e2a60aed0d41c4de4dac.tar.bz2
Simplifying raw data renderering support
Diffstat (limited to 'rest_framework/parsers.py')
-rw-r--r--rest_framework/parsers.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index c635505a..23387dff 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -12,7 +12,7 @@ from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter
from rest_framework.compat import etree, six, yaml
from rest_framework.exceptions import ParseError
-from rest_framework.renderers import UnicodeJSONRenderer
+from rest_framework import renderers
import json
import datetime
import decimal
@@ -32,8 +32,6 @@ class BaseParser(object):
media_type = None
- supports_html_forms = False
-
def parse(self, stream, media_type=None, parser_context=None):
"""
Given a stream to read from, return the parsed representation.
@@ -49,7 +47,7 @@ class JSONParser(BaseParser):
"""
media_type = 'application/json'
- renderer_class = UnicodeJSONRenderer
+ renderer_class = renderers.UnicodeJSONRenderer
def parse(self, stream, media_type=None, parser_context=None):
"""
@@ -94,7 +92,6 @@ class FormParser(BaseParser):
"""
media_type = 'application/x-www-form-urlencoded'
- supports_html_forms = True
def parse(self, stream, media_type=None, parser_context=None):
"""
@@ -113,7 +110,6 @@ class MultiPartParser(BaseParser):
"""
media_type = 'multipart/form-data'
- supports_html_forms = True
def parse(self, stream, media_type=None, parser_context=None):
"""
@@ -134,7 +130,7 @@ class MultiPartParser(BaseParser):
data, files = parser.parse()
return DataAndFiles(data, files)
except MultiPartParserError as exc:
- raise ParseError('Multipart form parse error - %s' % six.u(exc))
+ raise ParseError('Multipart form parse error - %s' % six.u(exc.strerror))
class XMLParser(BaseParser):