From 551c86c43a71f7dee5cce68c5142714301f6196f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sun, 14 Oct 2012 22:43:07 +0100
Subject: Documentation for parsers

---
 rest_framework/tests/request.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'rest_framework/tests/request.py')

diff --git a/rest_framework/tests/request.py b/rest_framework/tests/request.py
index 7b24b036..f00ee85f 100644
--- a/rest_framework/tests/request.py
+++ b/rest_framework/tests/request.py
@@ -10,9 +10,9 @@ from rest_framework import status
 from rest_framework.authentication import SessionAuthentication
 from django.test.client import RequestFactory
 from rest_framework.parsers import (
+    BaseParser,
     FormParser,
     MultiPartParser,
-    PlainTextParser,
     JSONParser
 )
 from rest_framework.request import Request
@@ -24,6 +24,19 @@ from rest_framework.views import APIView
 factory = RequestFactory()
 
 
+class PlainTextParser(BaseParser):
+    media_type = 'text/plain'
+
+    def parse_stream(self, stream, **opts):
+        """
+        Returns a 2-tuple of `(data, files)`.
+
+        `data` will simply be a string representing the body of the request.
+        `files` will always be `None`.
+        """
+        return stream.read()
+
+
 class TestMethodOverloading(TestCase):
     def test_method(self):
         """
-- 
cgit v1.2.3


From 9c1fba3483b7e81da0744464dcf23a5f12711de2 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 15 Oct 2012 13:27:50 +0100
Subject: Tweak parsers to take parser_context

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

(limited to 'rest_framework/tests/request.py')

diff --git a/rest_framework/tests/request.py b/rest_framework/tests/request.py
index f00ee85f..f90bebf4 100644
--- a/rest_framework/tests/request.py
+++ b/rest_framework/tests/request.py
@@ -27,7 +27,7 @@ factory = RequestFactory()
 class PlainTextParser(BaseParser):
     media_type = 'text/plain'
 
-    def parse_stream(self, stream, **opts):
+    def parse_stream(self, stream, parser_context=None):
         """
         Returns a 2-tuple of `(data, files)`.
 
-- 
cgit v1.2.3


From 99d48f90030d174ef80498b48f56af6489865f0d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 17 Oct 2012 22:07:56 +0100
Subject: Drop .parse_string_or_stream() - keep API minimal.

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

(limited to 'rest_framework/tests/request.py')

diff --git a/rest_framework/tests/request.py b/rest_framework/tests/request.py
index f90bebf4..f698e845 100644
--- a/rest_framework/tests/request.py
+++ b/rest_framework/tests/request.py
@@ -27,7 +27,7 @@ factory = RequestFactory()
 class PlainTextParser(BaseParser):
     media_type = 'text/plain'
 
-    def parse_stream(self, stream, parser_context=None):
+    def parse(self, stream, parser_context=None):
         """
         Returns a 2-tuple of `(data, files)`.
 
-- 
cgit v1.2.3


From fb56f215ae50da0aebe99e05036ece259fd3e6f1 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 17 Oct 2012 22:39:07 +0100
Subject: Added `media_type` to `.parse()` - Consistency with renderer API.

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

(limited to 'rest_framework/tests/request.py')

diff --git a/rest_framework/tests/request.py b/rest_framework/tests/request.py
index f698e845..ff48f3fa 100644
--- a/rest_framework/tests/request.py
+++ b/rest_framework/tests/request.py
@@ -27,7 +27,7 @@ factory = RequestFactory()
 class PlainTextParser(BaseParser):
     media_type = 'text/plain'
 
-    def parse(self, stream, parser_context=None):
+    def parse(self, stream, media_type=None, parser_context=None):
         """
         Returns a 2-tuple of `(data, files)`.
 
-- 
cgit v1.2.3