encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 12:30:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 4878353b46 into e85ef3b479

Browse Source
This commit is contained in:
pySilver 2014-08-18 18:58:19 +00:00
commit 40baeeb6b4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/tests/test_views.py
View File

@ -121,7 +121,7 @@ class TestCustomExceptionHandler(TestCase):
def setUp(self):
self.DEFAULT_HANDLER = api_settings.EXCEPTION_HANDLER
def exception_handler(exc):
def exception_handler(exc, request=None):
return Response('Error!', status=status.HTTP_400_BAD_REQUEST)
api_settings.EXCEPTION_HANDLER = exception_handler

4
rest_framework/views.py
View File

@ -45,7 +45,7 @@ def get_view_description(view_cls, html=False):
return description
def exception_handler(exc):
def exception_handler(exc, request=None):
"""
Returns the response that should be used for any given exception.
@ -362,7 +362,7 @@ class APIView(View):
else:
exc.status_code = status.HTTP_403_FORBIDDEN
response = self.settings.EXCEPTION_HANDLER(exc)
response = self.settings.EXCEPTION_HANDLER(exc, self.request)
if response is None:
raise