Commit f43f20bd by Tom Christie

Merge pull request #40 from ulmus/master

Added parsers.DEFAULT_PARSERS
parents 1885012d 3e0a978d
...@@ -21,3 +21,4 @@ MANIFEST ...@@ -21,3 +21,4 @@ MANIFEST
.coverage .coverage
.tox .tox
.DS_Store .DS_Store
.idea/*
\ No newline at end of file
...@@ -108,7 +108,8 @@ if yaml: ...@@ -108,7 +108,8 @@ if yaml:
except ValueError, exc: except ValueError, exc:
raise ErrorResponse(status.HTTP_400_BAD_REQUEST, raise ErrorResponse(status.HTTP_400_BAD_REQUEST,
{'detail': 'YAML parse error - %s' % unicode(exc)}) {'detail': 'YAML parse error - %s' % unicode(exc)})
else:
YAMLParser = None
class PlainTextParser(BaseParser): class PlainTextParser(BaseParser):
""" """
...@@ -167,3 +168,9 @@ class MultiPartParser(BaseParser): ...@@ -167,3 +168,9 @@ class MultiPartParser(BaseParser):
{'detail': 'multipart parse error - %s' % unicode(exc)}) {'detail': 'multipart parse error - %s' % unicode(exc)})
return django_parser.parse() return django_parser.parse()
DEFAULT_PARSERS = ( JSONParser,
FormParser,
MultiPartParser )
if YAMLParser:
DEFAULT_PARSERS += (YAMLParser,)
...@@ -44,9 +44,7 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView): ...@@ -44,9 +44,7 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView):
""" """
List of parsers the resource can parse the request with. List of parsers the resource can parse the request with.
""" """
parsers = ( parsers.JSONParser, parsers = parsers.DEFAULT_PARSERS
parsers.FormParser,
parsers.MultiPartParser )
""" """
List of all authenticating methods to attempt. List of all authenticating methods to attempt.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment