From 6b3500b684a43fb67c42231859fa27cf5193298a Mon Sep 17 00:00:00 2001
From: alexanderlukanin13
Date: Thu, 24 Oct 2013 17:52:52 +0600
Subject: Fixed UnicodeEncodeError when POST JSON via web interface; added test

---
 rest_framework/request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 977d4d96..b883d0d4 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -334,7 +334,7 @@ class Request(object):
             self._CONTENT_PARAM in self._data and
             self._CONTENTTYPE_PARAM in self._data):
             self._content_type = self._data[self._CONTENTTYPE_PARAM]
-            self._stream = BytesIO(self._data[self._CONTENT_PARAM].encode(HTTP_HEADER_ENCODING))
+            self._stream = BytesIO(self._data[self._CONTENT_PARAM].encode(self.parser_context['encoding']))
             self._data, self._files = (Empty, Empty)
 
     def _parse(self):
-- 
cgit v1.2.3


From c1d9a96df03ea81454d7d0e3583c68e270ed5043 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 3 Dec 2013 08:58:05 +0000
Subject: Catch errors during parsing and set empty .DATA/.FILES before
 re-raising.

---
 rest_framework/request.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index b883d0d4..9b551aa8 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -356,7 +356,16 @@ class Request(object):
         if not parser:
             raise exceptions.UnsupportedMediaType(media_type)
 
-        parsed = parser.parse(stream, media_type, self.parser_context)
+        try:
+            parsed = parser.parse(stream, media_type, self.parser_context)
+        except:
+            # If we get an exception during parsing, fill in empty data and
+            # re-raise.  Ensures we don't simply repeat the error when
+            # attempting to render the browsable renderer response, or when
+            # logging the request or similar. 
+            self._data = QueryDict('', self._request._encoding)
+            self._files = MultiValueDict()
+            raise
 
         # Parser classes may return the raw data, or a
         # DataAndFiles object.  Unpack the result as required.
-- 
cgit v1.2.3


From 06d8a31e132c99a9645e26b5def3a1d9b9585c24 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 9 Dec 2013 07:34:08 +0000
Subject: Catch and mask ParseErrors that occur during rendering of the
 BrowsableAPI.

---
 rest_framework/request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 9b551aa8..fcea2508 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -362,7 +362,7 @@ class Request(object):
             # If we get an exception during parsing, fill in empty data and
             # re-raise.  Ensures we don't simply repeat the error when
             # attempting to render the browsable renderer response, or when
-            # logging the request or similar. 
+            # logging the request or similar.
             self._data = QueryDict('', self._request._encoding)
             self._files = MultiValueDict()
             raise
-- 
cgit v1.2.3