aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorTom Christie2013-08-27 12:32:13 +0100
committerTom Christie2013-08-27 12:32:13 +0100
commitdce47a11d3d65a697ea8aa322455d626190bc1e5 (patch)
tree84668caad5332fe66396b2acc20e21c7c18940a3 /rest_framework
parentc3e273a90e08cc5215f9e9ea0508b62809b181a4 (diff)
downloaddjango-rest-framework-dce47a11d3d65a697ea8aa322455d626190bc1e5.tar.bz2
Move settings into more sensible ordering
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/settings.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 7d25e513..2ee15ac7 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -48,7 +48,6 @@ DEFAULTS = {
),
'DEFAULT_THROTTLE_CLASSES': (
),
-
'DEFAULT_CONTENT_NEGOTIATION_CLASS':
'rest_framework.negotiation.DefaultContentNegotiation',
@@ -69,14 +68,14 @@ DEFAULTS = {
'PAGINATE_BY': None,
'PAGINATE_BY_PARAM': None,
- # View configuration
- 'VIEW_NAME_FUNCTION': 'rest_framework.views.get_view_name',
- 'VIEW_DESCRIPTION_FUNCTION': 'rest_framework.views.get_view_description',
-
# Authentication
'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser',
'UNAUTHENTICATED_TOKEN': None,
+ # View configuration
+ 'VIEW_NAME_FUNCTION': 'rest_framework.views.get_view_name',
+ 'VIEW_DESCRIPTION_FUNCTION': 'rest_framework.views.get_view_description',
+
# Testing
'TEST_REQUEST_RENDERER_CLASSES': (
'rest_framework.renderers.MultiPartRenderer',