encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 19:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add ParseError (Removing ImmediateResponse)

Browse Source
This commit is contained in:
Tom Christie 2012-08-25 13:27:55 +01:00
parent aed26b218e
commit 26831df88e
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
djangorestframework/exceptions.py Normal file
View File

@ -0,0 +1,3 @@
class ParseError(Exception):
def __init__(self, detail):
self.detail = detail

18
djangorestframework/parsers.py
View File

@ -15,9 +15,8 @@ from django.http import QueryDict
from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
from django.http.multipartparser import MultiPartParserError from django.http.multipartparser import MultiPartParserError
from django.utils import simplejson as json from django.utils import simplejson as json
from djangorestframework import status
from djangorestframework.compat import yaml from djangorestframework.compat import yaml
from djangorestframework.response import ImmediateResponse from djangorestframework.exceptions import ParseError
from djangorestframework.utils.mediatypes import media_type_matches from djangorestframework.utils.mediatypes import media_type_matches
from xml.etree import ElementTree as ET from xml.etree import ElementTree as ET
from djangorestframework.compat import ETParseError from djangorestframework.compat import ETParseError
@ -83,9 +82,7 @@ class JSONParser(BaseParser):
try: try:
return (json.load(stream), None) return (json.load(stream), None)
except ValueError, exc: except ValueError, exc:
raise ImmediateResponse( raise ParseError('JSON parse error - %s' % unicode(exc))
{'detail': 'JSON parse error - %s' % unicode(exc)},
status=status.HTTP_400_BAD_REQUEST)
class YAMLParser(BaseParser): class YAMLParser(BaseParser):
@ -105,9 +102,7 @@ class YAMLParser(BaseParser):
try: try:
return (yaml.safe_load(stream), None) return (yaml.safe_load(stream), None)
except (ValueError, yaml.parser.ParserError), exc: except (ValueError, yaml.parser.ParserError), exc:
raise ImmediateResponse( raise ParseError('YAML parse error - %s' % unicode(exc))
{'detail': 'YAML parse error - %s' % unicode(exc)},
status=status.HTTP_400_BAD_REQUEST)
class PlainTextParser(BaseParser): class PlainTextParser(BaseParser):
@ -163,9 +158,7 @@ class MultiPartParser(BaseParser):
parser = DjangoMultiPartParser(meta, stream, upload_handlers) parser = DjangoMultiPartParser(meta, stream, upload_handlers)
return parser.parse() return parser.parse()
except MultiPartParserError, exc: except MultiPartParserError, exc:
raise ImmediateResponse( raise ParseError('Multipart form parse error - %s' % unicode(exc))
{'detail': 'multipart parse error - %s' % unicode(exc)},
status=status.HTTP_400_BAD_REQUEST)
class XMLParser(BaseParser): class XMLParser(BaseParser):
@ -185,8 +178,7 @@ class XMLParser(BaseParser):
try: try:
tree = ET.parse(stream) tree = ET.parse(stream)
except (ExpatError, ETParseError, ValueError), exc: except (ExpatError, ETParseError, ValueError), exc:
content = {'detail': 'XML parse error - %s' % unicode(exc)} raise ParseError('XML parse error - %s' % unicode(exc))
raise ImmediateResponse(content, status=status.HTTP_400_BAD_REQUEST)
data = self._xml_convert(tree.getroot()) data = self._xml_convert(tree.getroot())
return (data, None) return (data, None)

4
djangorestframework/views.py
View File

@ -13,7 +13,7 @@ from django.views.decorators.csrf import csrf_exempt
from djangorestframework.compat import View as DjangoView, apply_markdown from djangorestframework.compat import View as DjangoView, apply_markdown
from djangorestframework.response import Response, ImmediateResponse from djangorestframework.response import Response, ImmediateResponse
from djangorestframework.request import Request from djangorestframework.request import Request
from djangorestframework import renderers, parsers, authentication, permissions, status from djangorestframework import renderers, parsers, authentication, permissions, status, exceptions
__all__ = ( __all__ = (
@ -249,6 +249,8 @@ class View(DjangoView):
except ImmediateResponse, exc: except ImmediateResponse, exc:
response = exc.response response = exc.response
except exceptions.ParseError as exc:
response = Response({'detail': exc.detail}, status=status.HTTP_400_BAD_REQUEST)
self.response = self.final(request, response, *args, **kwargs) self.response = self.final(request, response, *args, **kwargs)
return self.response return self.response