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

Merge 28b801bc1b into 99382f3ccb

Browse Source
This commit is contained in:
Adam Nelson 2017-06-03 01:27:07 +00:00 committed by GitHub
commit d4e975f42b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
requirements/requirements-codestyle.txt
View File

@ -1,6 +1,6 @@
# PEP8 code linting, which we run on all commits. # PEP8 code linting, which we run on all commits.
flake8==2.4.0 flake8==3.0.4
pep8==1.5.7 pep8==1.7.0
# Sort and lint imports # Sort and lint imports
isort==4.2.5 isort==4.2.5

4
requirements/requirements-packaging.txt
View File

@ -2,10 +2,10 @@
wheel==0.29.0 wheel==0.29.0
# Twine for secured PyPI uploads. # Twine for secured PyPI uploads.
twine==1.6.5 twine==1.8.1
# Transifex client for managing translation resources. # Transifex client for managing translation resources.
transifex-client==0.11 transifex-client==0.12.2
# Pandoc to have a nice pypi page # Pandoc to have a nice pypi page
pypandoc pypandoc

2
rest_framework/views.py
View File

@ -457,7 +457,7 @@ class APIView(View):
renderer_format = getattr(request.accepted_renderer, 'format') renderer_format = getattr(request.accepted_renderer, 'format')
use_plaintext_traceback = renderer_format not in ('html', 'api', 'admin') use_plaintext_traceback = renderer_format not in ('html', 'api', 'admin')
request.force_plaintext_errors(use_plaintext_traceback) request.force_plaintext_errors(use_plaintext_traceback)
raise raise exc
# Note: Views are made CSRF exempt from within `as_view` as to prevent # Note: Views are made CSRF exempt from within `as_view` as to prevent
# accidental removal of this exemption in cases where `dispatch` needs to # accidental removal of this exemption in cases where `dispatch` needs to