aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/parsers.py
diff options
context:
space:
mode:
authorRob Hudson2013-10-31 15:03:50 -0700
committerRob Hudson2013-10-31 15:03:50 -0700
commite33435d0da0dba13fae39070b3d87ad8af47862f (patch)
treee672c107d8c89cff561164c24a42c7e6eeb3ee3b /rest_framework/parsers.py
parent7ef83cf020b7f5e80e0bead31e72541bf720fc7f (diff)
downloaddjango-rest-framework-e33435d0da0dba13fae39070b3d87ad8af47862f.tar.bz2
Fixed exception handling with YAML and XML parsers.
Diffstat (limited to 'rest_framework/parsers.py')
-rw-r--r--rest_framework/parsers.py4
1 files changed, 2 insertions, 2 deletions
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