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


From e33435d0da0dba13fae39070b3d87ad8af47862f Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Thu, 31 Oct 2013 15:03:50 -0700
Subject: Fixed exception handling with YAML and XML parsers.

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 98fc0341..f1b3e38d 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -83,7 +83,7 @@ class YAMLParser(BaseParser):
             data = stream.read().decode(encoding)
             return yaml.safe_load(data)
         except (ValueError, yaml.parser.ParserError) as exc:
-            raise ParseError('YAML parse error - %s' % six.u(exc))
+            raise ParseError('YAML parse error - %s' % six.text_type(exc))
 
 
 class FormParser(BaseParser):
@@ -153,7 +153,7 @@ class XMLParser(BaseParser):
         try:
             tree = etree.parse(stream, parser=parser, forbid_dtd=True)
         except (etree.ParseError, ValueError) as exc:
-            raise ParseError('XML parse error - %s' % six.u(exc))
+            raise ParseError('XML parse error - %s' % six.text_type(exc))
         data = self._xml_convert(tree.getroot())
 
         return data
-- 
cgit v1.2.3


From 4b3eb6e0b0e6412693de126ac92482a276ca9a78 Mon Sep 17 00:00:00 2001
From: Vladislav Vlastovskiy
Date: Mon, 14 Apr 2014 12:21:38 +0400
Subject: Fixed parse file name

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index f1b3e38d..703cefca 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -288,7 +288,7 @@ class FileUploadParser(BaseParser):
 
         try:
             meta = parser_context['request'].META
-            disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'])
+            disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))
             return disposition[1]['filename']
         except (AttributeError, KeyError):
             pass
-- 
cgit v1.2.3


From d474934d365291c28d5741898257cbdd5d0aa9ec Mon Sep 17 00:00:00 2001
From: Vladislav Vlastovskiy
Date: Mon, 14 Apr 2014 13:01:24 +0400
Subject: Fixed return type

From bytes to str---
 rest_framework/parsers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 703cefca..d49b17a4 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -10,6 +10,7 @@ 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 django.utils.encoding import force_str
 from rest_framework.compat import etree, six, yaml
 from rest_framework.exceptions import ParseError
 from rest_framework import renderers
@@ -289,6 +290,6 @@ class FileUploadParser(BaseParser):
         try:
             meta = parser_context['request'].META
             disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))
-            return disposition[1]['filename']
+            return force_str(disposition[1]['filename'])
         except (AttributeError, KeyError):
             pass
-- 
cgit v1.2.3


From 3fe038357267f947eba467f2b7714a782fa93c33 Mon Sep 17 00:00:00 2001
From: Vladislav Vlastovskiy
Date: Mon, 14 Apr 2014 13:21:24 +0400
Subject: Fixed convert bytes to str

Use compact function for convert---
 rest_framework/parsers.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index d49b17a4..4990971b 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -10,8 +10,7 @@ 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 django.utils.encoding import force_str
-from rest_framework.compat import etree, six, yaml
+from rest_framework.compat import etree, six, yaml, force_text
 from rest_framework.exceptions import ParseError
 from rest_framework import renderers
 import json
@@ -290,6 +289,6 @@ class FileUploadParser(BaseParser):
         try:
             meta = parser_context['request'].META
             disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))
-            return force_str(disposition[1]['filename'])
+            return force_text(disposition[1]['filename'])
         except (AttributeError, KeyError):
             pass
-- 
cgit v1.2.3


From 63d02dbea855a060ec4cdb194497188e2f40cb66 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 19 Aug 2014 17:06:55 +0100
Subject: Drop six from compat. 1.4.2 is now the lowest supported version.

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 4990971b..aa4fd3f1 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -10,7 +10,8 @@ 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 etree, six, yaml, force_text
+from django.utils import six
+from rest_framework.compat import etree, yaml, force_text
 from rest_framework.exceptions import ParseError
 from rest_framework import renderers
 import json
-- 
cgit v1.2.3


From 8a9f34b838adc285f2d877846fda19349e28ab30 Mon Sep 17 00:00:00 2001
From: Vladislav Vlastovskiy
Date: Mon, 14 Apr 2014 14:18:10 +0400
Subject: Added get filename as encoded  This filename described in RFC 6266

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index aa4fd3f1..f285ac97 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -11,7 +11,7 @@ from django.http import QueryDict
 from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
 from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter
 from django.utils import six
-from rest_framework.compat import etree, yaml, force_text
+from rest_framework.compat import etree, yaml, force_text, urlparse
 from rest_framework.exceptions import ParseError
 from rest_framework import renderers
 import json
@@ -290,6 +290,17 @@ class FileUploadParser(BaseParser):
         try:
             meta = parser_context['request'].META
             disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))
-            return force_text(disposition[1]['filename'])
+
+            filename = force_text(disposition[1]['filename'])
+
+            if 'filename*' in disposition[1]:
+                filename_encoded = force_text(disposition[1]['filename*'])
+                try:
+                    charset, filename_encoded = filename_encoded.split('\'\'', 1)
+                    filename = urlparse.unquote(filename_encoded, charset)
+                except (ValueError, LookupError):
+                    pass
+
+            return filename
         except (AttributeError, KeyError):
             pass
-- 
cgit v1.2.3


From bcca9ed0fd0af251e5a64be0ab7865b396d6b4b8 Mon Sep 17 00:00:00 2001
From: Vladislav Vlastovskiy
Date: Mon, 14 Apr 2014 15:03:50 +0400
Subject: Removed use encoding available only in py3

---
 rest_framework/parsers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index f285ac97..c67f0088 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -291,15 +291,15 @@ class FileUploadParser(BaseParser):
             meta = parser_context['request'].META
             disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))
 
-            filename = force_text(disposition[1]['filename'])
-
             if 'filename*' in disposition[1]:
                 filename_encoded = force_text(disposition[1]['filename*'])
                 try:
                     charset, filename_encoded = filename_encoded.split('\'\'', 1)
-                    filename = urlparse.unquote(filename_encoded, charset)
+                    filename = urlparse.unquote(filename_encoded)
                 except (ValueError, LookupError):
-                    pass
+                    filename = force_text(disposition[1]['filename'])
+            else:
+                filename = force_text(disposition[1]['filename'])
 
             return filename
         except (AttributeError, KeyError):
-- 
cgit v1.2.3


From bcd8a24db1d7022cac3d11641c563f0bfdbb8e97 Mon Sep 17 00:00:00 2001
From: Jason Bittel
Date: Fri, 5 Sep 2014 14:56:54 -0700
Subject: Refactor encoded filename feature per #1531

---
 rest_framework/parsers.py | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index c67f0088..82caa6f6 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -289,18 +289,22 @@ class FileUploadParser(BaseParser):
 
         try:
             meta = parser_context['request'].META
-            disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))
-
-            if 'filename*' in disposition[1]:
-                filename_encoded = force_text(disposition[1]['filename*'])
-                try:
-                    charset, filename_encoded = filename_encoded.split('\'\'', 1)
-                    filename = urlparse.unquote(filename_encoded)
-                except (ValueError, LookupError):
-                    filename = force_text(disposition[1]['filename'])
-            else:
-                filename = force_text(disposition[1]['filename'])
-
-            return filename
+            disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))[1]
+            if 'filename*' in disposition:
+                return self.get_encoded_filename(disposition)
+            return force_text(disposition['filename'])
         except (AttributeError, KeyError):
             pass
+
+    def get_encoded_filename(self, disposition):
+        """
+        Handle encoded filenames per RFC6266. See also:
+        http://tools.ietf.org/html/rfc2231#section-4
+        """
+        encoded_filename = force_text(disposition['filename*'])
+        try:
+            charset, filename = encoded_filename.split('\'\'', 1)
+            filename = urlparse.unquote(filename)
+        except (ValueError, LookupError):
+            filename = force_text(disposition['filename'])
+        return filename
-- 
cgit v1.2.3


From c8e475023c527f3ad22258c4ae0e0b5d992cb98b Mon Sep 17 00:00:00 2001
From: Jason Bittel
Date: Fri, 5 Sep 2014 15:22:43 -0700
Subject: Fix encoded filename parsing to allow for lang

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 82caa6f6..161bc809 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -303,7 +303,7 @@ class FileUploadParser(BaseParser):
         """
         encoded_filename = force_text(disposition['filename*'])
         try:
-            charset, filename = encoded_filename.split('\'\'', 1)
+            charset, lang, filename = encoded_filename.split('\'', 2)
             filename = urlparse.unquote(filename)
         except (ValueError, LookupError):
             filename = force_text(disposition['filename'])
-- 
cgit v1.2.3


From 3f7fad2e5a1dd2cccaff97d662745ac24cc18efa Mon Sep 17 00:00:00 2001
From: Jason Bittel
Date: Fri, 5 Sep 2014 16:27:55 -0700
Subject: Refactor disposition unpacking for clarity

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 161bc809..c287908d 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -289,22 +289,23 @@ class FileUploadParser(BaseParser):
 
         try:
             meta = parser_context['request'].META
-            disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))[1]
-            if 'filename*' in disposition:
-                return self.get_encoded_filename(disposition)
-            return force_text(disposition['filename'])
+            disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))
+            filename_parm = disposition[1]
+            if 'filename*' in filename_parm:
+                return self.get_encoded_filename(filename_parm)
+            return force_text(filename_parm['filename'])
         except (AttributeError, KeyError):
             pass
 
-    def get_encoded_filename(self, disposition):
+    def get_encoded_filename(self, filename_parm):
         """
         Handle encoded filenames per RFC6266. See also:
         http://tools.ietf.org/html/rfc2231#section-4
         """
-        encoded_filename = force_text(disposition['filename*'])
+        encoded_filename = force_text(filename_parm['filename*'])
         try:
             charset, lang, filename = encoded_filename.split('\'', 2)
             filename = urlparse.unquote(filename)
         except (ValueError, LookupError):
-            filename = force_text(disposition['filename'])
+            filename = force_text(filename_parm['filename'])
         return filename
-- 
cgit v1.2.3


From 5e39e159ee6aee90755709cfecec7d22c7ea3049 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 12 Sep 2014 11:38:22 +0100
Subject: UNICODE_JSON and COMPACT_JSON settings

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index c287908d..fa02ecf1 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -48,7 +48,7 @@ class JSONParser(BaseParser):
     """
 
     media_type = 'application/json'
-    renderer_class = renderers.UnicodeJSONRenderer
+    renderer_class = renderers.JSONRenderer
 
     def parse(self, stream, media_type=None, parser_context=None):
         """
-- 
cgit v1.2.3


From 381771731f48c75e7d5951e353049cceec386512 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 1 Oct 2014 13:09:14 +0100
Subject: Use six.text_type instead of str everywhere

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

(limited to 'rest_framework/parsers.py')

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


From 731c8421afe3093a78cdabb9c3cc28fa52cd1c8e Mon Sep 17 00:00:00 2001
From: José Padilla
Date: Sat, 29 Nov 2014 14:43:05 -0400
Subject: Remove YAML support from core

---
 rest_framework/parsers.py | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index ccb82f03..e6bb75f6 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -12,7 +12,7 @@ from django.http import QueryDict
 from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
 from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter
 from django.utils import six
-from rest_framework.compat import etree, yaml, force_text, urlparse
+from rest_framework.compat import etree, force_text, urlparse
 from rest_framework.exceptions import ParseError
 from rest_framework import renderers
 import json
@@ -65,29 +65,6 @@ class JSONParser(BaseParser):
             raise ParseError('JSON parse error - %s' % six.text_type(exc))
 
 
-class YAMLParser(BaseParser):
-    """
-    Parses YAML-serialized data.
-    """
-
-    media_type = 'application/yaml'
-
-    def parse(self, stream, media_type=None, parser_context=None):
-        """
-        Parses the incoming bytestream as YAML and returns the resulting data.
-        """
-        assert yaml, 'YAMLParser requires pyyaml to be installed'
-
-        parser_context = parser_context or {}
-        encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET)
-
-        try:
-            data = stream.read().decode(encoding)
-            return yaml.safe_load(data)
-        except (ValueError, yaml.parser.ParserError) as exc:
-            raise ParseError('YAML parse error - %s' % six.text_type(exc))
-
-
 class FormParser(BaseParser):
     """
     Parser for form data.
-- 
cgit v1.2.3


From 7f9dc736728baf92a3198a7f90bd302fff240373 Mon Sep 17 00:00:00 2001
From: José Padilla
Date: Sat, 29 Nov 2014 14:50:51 -0400
Subject: Remove XML support from core

---
 rest_framework/parsers.py | 76 +----------------------------------------------
 1 file changed, 1 insertion(+), 75 deletions(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index ccb82f03..6d0e932b 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -12,12 +12,10 @@ from django.http import QueryDict
 from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
 from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter
 from django.utils import six
-from rest_framework.compat import etree, yaml, force_text, urlparse
+from rest_framework.compat import yaml, force_text, urlparse
 from rest_framework.exceptions import ParseError
 from rest_framework import renderers
 import json
-import datetime
-import decimal
 
 
 class DataAndFiles(object):
@@ -136,78 +134,6 @@ class MultiPartParser(BaseParser):
             raise ParseError('Multipart form parse error - %s' % six.text_type(exc))
 
 
-class XMLParser(BaseParser):
-    """
-    XML parser.
-    """
-
-    media_type = 'application/xml'
-
-    def parse(self, stream, media_type=None, parser_context=None):
-        """
-        Parses the incoming bytestream as XML and returns the resulting data.
-        """
-        assert etree, 'XMLParser requires defusedxml to be installed'
-
-        parser_context = parser_context or {}
-        encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET)
-        parser = etree.DefusedXMLParser(encoding=encoding)
-        try:
-            tree = etree.parse(stream, parser=parser, forbid_dtd=True)
-        except (etree.ParseError, ValueError) as exc:
-            raise ParseError('XML parse error - %s' % six.text_type(exc))
-        data = self._xml_convert(tree.getroot())
-
-        return data
-
-    def _xml_convert(self, element):
-        """
-        convert the xml `element` into the corresponding python object
-        """
-
-        children = list(element)
-
-        if len(children) == 0:
-            return self._type_convert(element.text)
-        else:
-            # if the fist child tag is list-item means all children are list-item
-            if children[0].tag == "list-item":
-                data = []
-                for child in children:
-                    data.append(self._xml_convert(child))
-            else:
-                data = {}
-                for child in children:
-                    data[child.tag] = self._xml_convert(child)
-
-            return data
-
-    def _type_convert(self, value):
-        """
-        Converts the value returned by the XMl parse into the equivalent
-        Python type
-        """
-        if value is None:
-            return value
-
-        try:
-            return datetime.datetime.strptime(value, '%Y-%m-%d %H:%M:%S')
-        except ValueError:
-            pass
-
-        try:
-            return int(value)
-        except ValueError:
-            pass
-
-        try:
-            return decimal.Decimal(value)
-        except decimal.InvalidOperation:
-            pass
-
-        return value
-
-
 class FileUploadParser(BaseParser):
     """
     Parser for file upload data.
-- 
cgit v1.2.3


From 0359e9250d34e18aef2db6216f24c130a4f51fce Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 2 Dec 2014 13:52:46 +0000
Subject: FileUploadParser. Raising StopFutureHandlers removes any handlers not
 yet run for the active set. Closes #2109.

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index ccb82f03..d229abec 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -256,23 +256,24 @@ class FileUploadParser(BaseParser):
         chunks = ChunkIter(stream, chunk_size)
         counters = [0] * len(upload_handlers)
 
-        for handler in upload_handlers:
+        for index, handler in enumerate(upload_handlers):
             try:
                 handler.new_file(None, filename, content_type,
                                  content_length, encoding)
             except StopFutureHandlers:
+                upload_handlers = upload_handlers[:index + 1]
                 break
 
         for chunk in chunks:
-            for i, handler in enumerate(upload_handlers):
+            for index, handler in enumerate(upload_handlers):
                 chunk_length = len(chunk)
-                chunk = handler.receive_data_chunk(chunk, counters[i])
-                counters[i] += chunk_length
+                chunk = handler.receive_data_chunk(chunk, counters[index])
+                counters[index] += chunk_length
                 if chunk is None:
                     break
 
-        for i, handler in enumerate(upload_handlers):
-            file_obj = handler.file_complete(counters[i])
+        for index, handler in enumerate(upload_handlers):
+            file_obj = handler.file_complete(counters[index])
             if file_obj:
                 return DataAndFiles(None, {'file': file_obj})
         raise ParseError("FileUpload parse error - "
-- 
cgit v1.2.3


From d54c67d79d0f5661ef33d860efe80a4272e22b3e Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin
Date: Thu, 4 Dec 2014 03:11:42 +0100
Subject: Removed custom StringIO, force_text, smart_text compat

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index d229abec..7b948362 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -12,7 +12,8 @@ from django.http import QueryDict
 from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
 from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter
 from django.utils import six
-from rest_framework.compat import etree, yaml, force_text, urlparse
+from django.utils.encoding import force_text
+from rest_framework.compat import etree, yaml, urlparse
 from rest_framework.exceptions import ParseError
 from rest_framework import renderers
 import json
-- 
cgit v1.2.3


From 95af92ca01435c32f4374d26eb448f964d77c81a Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin
Date: Thu, 4 Dec 2014 15:47:42 +0100
Subject: Removed custom urlparse compat

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 7b948362..3e3395c0 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -12,8 +12,9 @@ from django.http import QueryDict
 from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
 from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter
 from django.utils import six
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.encoding import force_text
-from rest_framework.compat import etree, yaml, urlparse
+from rest_framework.compat import etree, yaml
 from rest_framework.exceptions import ParseError
 from rest_framework import renderers
 import json
-- 
cgit v1.2.3


From d6bff10f9829b3cef1c2773c303b172a8c7ec525 Mon Sep 17 00:00:00 2001
From: Ask Holme
Date: Sat, 10 Jan 2015 18:15:21 +0100
Subject: Make FileUploadParser work with standard django API

Output from parsers ends up in a Django MergeDict and they exists elements to be dicts - not None---
 rest_framework/parsers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 3e3395c0..401856ec 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -277,7 +277,7 @@ class FileUploadParser(BaseParser):
         for index, handler in enumerate(upload_handlers):
             file_obj = handler.file_complete(counters[index])
             if file_obj:
-                return DataAndFiles(None, {'file': file_obj})
+                return DataAndFiles({}, {'file': file_obj})
         raise ParseError("FileUpload parse error - "
                          "none of upload handlers can handle the stream")
 
-- 
cgit v1.2.3


From f1ac9d3f9b6c306b7fa48381006d8259c1642a99 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 23 Jan 2015 12:26:44 +0000
Subject: More graceful handling of malformed Content-Disposition

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 401856ec..ef72677c 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -298,7 +298,7 @@ class FileUploadParser(BaseParser):
             if 'filename*' in filename_parm:
                 return self.get_encoded_filename(filename_parm)
             return force_text(filename_parm['filename'])
-        except (AttributeError, KeyError):
+        except (AttributeError, KeyError, ValueError):
             pass
 
     def get_encoded_filename(self, filename_parm):
-- 
cgit v1.2.3


From a1fa7218ebc4a77a3912c42221927b1846f555fd Mon Sep 17 00:00:00 2001
From: Alexander Dutton
Date: Fri, 23 Jan 2015 16:48:23 +0000
Subject: Pass {} as data to DataAndFiles, as it ends up in a MergeDict

In the same vein as #2399.
---
 rest_framework/parsers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index ef72677c..1efab85b 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -250,7 +250,7 @@ class FileUploadParser(BaseParser):
                                               None,
                                               encoding)
             if result is not None:
-                return DataAndFiles(None, {'file': result[1]})
+                return DataAndFiles({}, {'file': result[1]})
 
         # This is the standard case.
         possible_sizes = [x.chunk_size for x in upload_handlers if x.chunk_size]
-- 
cgit v1.2.3