diff options
| author | Xavier Ordoquy | 2012-11-22 00:20:49 +0100 | 
|---|---|---|
| committer | Xavier Ordoquy | 2012-11-22 00:20:49 +0100 | 
| commit | b3698acb6c0b9eaa04189599e27014c788a75adc (patch) | |
| tree | 25de3a90ca99b6de980ce0c4031ffb512d9f9c00 /rest_framework/parsers.py | |
| parent | ab3c47297481b7a4ff66027618f9c05bf02a2204 (diff) | |
| download | django-rest-framework-b3698acb6c0b9eaa04189599e27014c788a75adc.tar.bz2 | |
First passing test under p3k \o/
Diffstat (limited to 'rest_framework/parsers.py')
| -rw-r--r-- | rest_framework/parsers.py | 8 | 
1 files changed, 4 insertions, 4 deletions
| 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()) | 
