aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/settings.py
diff options
context:
space:
mode:
authorTom Christie2013-08-19 07:40:30 +0100
committerTom Christie2013-08-19 07:40:30 +0100
commita8aabe23c94b1281ac8ca752a09555c1b0ef163d (patch)
treeafcf5191bb5d2107747c3f82a1801e2e602808c1 /rest_framework/settings.py
parentc1ccd8b5b5aef1bd209862f9431c9c03e25ae755 (diff)
parent5a374955b14e1f1fdc85f0fa68284dbf6b83ab5f (diff)
downloaddjango-rest-framework-a8aabe23c94b1281ac8ca752a09555c1b0ef163d.tar.bz2
Merge branch 'master' of git://github.com/chrispaolini/django-rest-framework into chrispaolini-master
Diffstat (limited to 'rest_framework/settings.py')
-rw-r--r--rest_framework/settings.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 8fd177d5..0b2bdb62 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -69,6 +69,10 @@ DEFAULTS = {
'PAGINATE_BY': None,
'PAGINATE_BY_PARAM': None,
+ # View configuration
+ 'VIEW_NAME_FUNCTION': 'rest_framework.utils.formatting.view_name',
+ 'VIEW_DESCRIPTION_FUNCTION': 'rest_framework.utils.formatting.view_description',
+
# Authentication
'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser',
'UNAUTHENTICATED_TOKEN': None,
@@ -125,6 +129,8 @@ IMPORT_STRINGS = (
'TEST_REQUEST_RENDERER_CLASSES',
'UNAUTHENTICATED_USER',
'UNAUTHENTICATED_TOKEN',
+ 'VIEW_NAME_FUNCTION',
+ 'VIEW_DESCRIPTION_FUNCTION'
)