encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-06-29 18:03:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 20c7e605c9 into 1885012d61

Browse Source
This commit is contained in:
GitHub Merge Button 2011-07-02 10:16:47 -07:00
commit f168ac9938
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,3 +21,4 @@ MANIFEST
.coverage .coverage
.tox .tox
.DS_Store .DS_Store
.idea/*

6
djangorestframework/parsers.py
View File

@ -167,3 +167,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,)

4
djangorestframework/views.py
View File

@ -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.