From 8d590ebfded0968e458f8e3a87efabec8384586e Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 27 Aug 2013 11:22:19 +0100
Subject: First hacky pass at displaying raw data

---
 rest_framework/parsers.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 96bfac84..c635505a 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -10,9 +10,9 @@ 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 rest_framework.compat import yaml, etree
+from rest_framework.compat import etree, six, yaml
 from rest_framework.exceptions import ParseError
-from rest_framework.compat import six
+from rest_framework.renderers import UnicodeJSONRenderer
 import json
 import datetime
 import decimal
@@ -32,6 +32,8 @@ 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.
@@ -47,6 +49,7 @@ class JSONParser(BaseParser):
     """
 
     media_type = 'application/json'
+    renderer_class = UnicodeJSONRenderer
 
     def parse(self, stream, media_type=None, parser_context=None):
         """
@@ -91,6 +94,7 @@ class FormParser(BaseParser):
     """
 
     media_type = 'application/x-www-form-urlencoded'
+    supports_html_forms = True
 
     def parse(self, stream, media_type=None, parser_context=None):
         """
@@ -109,6 +113,7 @@ class MultiPartParser(BaseParser):
     """
 
     media_type = 'multipart/form-data'
+    supports_html_forms = True
 
     def parse(self, stream, media_type=None, parser_context=None):
         """
-- 
cgit v1.2.3


From 18007d68464b0cfab970e2a60aed0d41c4de4dac Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 28 Aug 2013 21:52:56 +0100
Subject: Simplifying raw data renderering support

---
 rest_framework/parsers.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'rest_framework/parsers.py')

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):
-- 
cgit v1.2.3


From 2247fd68e9b3bbc91075a11f44db16fc40497b2a Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 29 Aug 2013 21:24:29 +0100
Subject: Fix multipart error when used via content-type overloading

---
 rest_framework/parsers.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 23387dff..98fc0341 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -122,7 +122,8 @@ class MultiPartParser(BaseParser):
         parser_context = parser_context or {}
         request = parser_context['request']
         encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET)
-        meta = request.META
+        meta = request.META.copy()
+        meta['CONTENT_TYPE'] = media_type
         upload_handlers = request.upload_handlers
 
         try:
@@ -130,7 +131,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.strerror))
+            raise ParseError('Multipart form parse error - %s' % str(exc))
 
 
 class XMLParser(BaseParser):
-- 
cgit v1.2.3