From b3698acb6c0b9eaa04189599e27014c788a75adc Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 22 Nov 2012 00:20:49 +0100
Subject: First passing test under p3k \o/

---
 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 4841676c..361dfb77 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -56,7 +56,7 @@ class JSONParser(BaseParser):
         """
         try:
             return json.load(stream)
-        except ValueError, exc:
+        except ValueError as exc:
             raise ParseError('JSON parse error - %s' % unicode(exc))
 
 
@@ -76,7 +76,7 @@ class YAMLParser(BaseParser):
         """
         try:
             return yaml.safe_load(stream)
-        except (ValueError, yaml.parser.ParserError), exc:
+        except (ValueError, yaml.parser.ParserError) as exc:
             raise ParseError('YAML parse error - %s' % unicode(exc))
 
 
@@ -121,7 +121,7 @@ class MultiPartParser(BaseParser):
             parser = DjangoMultiPartParser(meta, stream, upload_handlers)
             data, files = parser.parse()
             return DataAndFiles(data, files)
-        except MultiPartParserError, exc:
+        except MultiPartParserError as exc:
             raise ParseError('Multipart form parse error - %s' % unicode(exc))
 
 
@@ -135,7 +135,7 @@ class XMLParser(BaseParser):
     def parse(self, stream, media_type=None, parser_context=None):
         try:
             tree = ET.parse(stream)
-        except (ExpatError, ETParseError, ValueError), exc:
+        except (ExpatError, ETParseError, ValueError) as exc:
             raise ParseError('XML parse error - %s' % unicode(exc))
         data = self._xml_convert(tree.getroot())
 
-- 
cgit v1.2.3


From e348ee92552aab51290dfe6b256ad03b8d62e6f9 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Fri, 23 Nov 2012 01:12:33 +0100
Subject: 52 tests passing. Refactored a few string / byte io.

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 361dfb77..d5cfaaf8 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -5,6 +5,8 @@ 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.
 """
 
+import six
+
 from django.http import QueryDict
 from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
 from django.http.multipartparser import MultiPartParserError
@@ -55,9 +57,10 @@ class JSONParser(BaseParser):
         `files` will always be `None`.
         """
         try:
-            return json.load(stream)
+            data = stream.read().decode('iso-8859-1')
+            return json.loads(data)
         except ValueError as exc:
-            raise ParseError('JSON parse error - %s' % unicode(exc))
+            raise ParseError('JSON parse error - %s' % six.text_type(exc))
 
 
 class YAMLParser(BaseParser):
@@ -75,9 +78,10 @@ class YAMLParser(BaseParser):
         `files` will always be `None`.
         """
         try:
-            return yaml.safe_load(stream)
+            data = stream.read().decode('iso-8859-1')
+            return yaml.safe_load(data)
         except (ValueError, yaml.parser.ParserError) as exc:
-            raise ParseError('YAML parse error - %s' % unicode(exc))
+            raise ParseError('YAML parse error - %s' % six.u(exc))
 
 
 class FormParser(BaseParser):
@@ -122,7 +126,7 @@ class MultiPartParser(BaseParser):
             data, files = parser.parse()
             return DataAndFiles(data, files)
         except MultiPartParserError as exc:
-            raise ParseError('Multipart form parse error - %s' % unicode(exc))
+            raise ParseError('Multipart form parse error - %s' % six.u(exc))
 
 
 class XMLParser(BaseParser):
@@ -136,7 +140,7 @@ class XMLParser(BaseParser):
         try:
             tree = ET.parse(stream)
         except (ExpatError, ETParseError, ValueError) as exc:
-            raise ParseError('XML parse error - %s' % unicode(exc))
+            raise ParseError('XML parse error - %s' % six.u(exc))
         data = self._xml_convert(tree.getroot())
 
         return data
-- 
cgit v1.2.3


From 60250f22c8e144494f372338c16a2167cccb319d Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 3 Jan 2013 11:41:07 +0100
Subject: Move the various compat things to the compat module.

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

(limited to 'rest_framework/parsers.py')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index d5cfaaf8..7c01006a 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -5,14 +5,13 @@ 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.
 """
 
-import six
-
 from django.http import QueryDict
 from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
 from django.http.multipartparser import MultiPartParserError
 from django.utils import simplejson as json
 from rest_framework.compat import yaml, ETParseError
 from rest_framework.exceptions import ParseError
+from rest_framework.compat import six
 from xml.etree import ElementTree as ET
 from xml.parsers.expat import ExpatError
 import datetime
-- 
cgit v1.2.3