diff options
| author | Tom Christie | 2012-09-20 17:44:34 +0100 | 
|---|---|---|
| committer | Tom Christie | 2012-09-20 17:44:34 +0100 | 
| commit | d9cba6398e2323b8d8cd34f791442528517e01b4 (patch) | |
| tree | 4a8d378584e10c669acee2574fbd47f38f35785f /rest_framework/settings.py | |
| parent | f4670c89969503919cd597529f19174e67acd388 (diff) | |
| download | django-rest-framework-d9cba6398e2323b8d8cd34f791442528517e01b4.tar.bz2 | |
Clean up bits of templates etc
Diffstat (limited to 'rest_framework/settings.py')
| -rw-r--r-- | rest_framework/settings.py | 5 | 
1 files changed, 2 insertions, 3 deletions
| diff --git a/rest_framework/settings.py b/rest_framework/settings.py index fef8097e..a0b99010 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -24,9 +24,7 @@ from django.utils import importlib  DEFAULTS = {      'DEFAULT_RENDERERS': (          'rest_framework.renderers.JSONRenderer', -        'rest_framework.renderers.JSONPRenderer',          'rest_framework.renderers.DocumentingHTMLRenderer', -        'rest_framework.renderers.DocumentingPlainTextRenderer',      ),      'DEFAULT_PARSERS': (          'rest_framework.parsers.JSONParser', @@ -38,7 +36,8 @@ DEFAULTS = {      ),      'DEFAULT_PERMISSIONS': (),      'DEFAULT_THROTTLES': (), -    'DEFAULT_CONTENT_NEGOTIATION': 'rest_framework.negotiation.DefaultContentNegotiation', +    'DEFAULT_CONTENT_NEGOTIATION': +        'rest_framework.negotiation.DefaultContentNegotiation',      'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser',      'UNAUTHENTICATED_TOKEN': None, | 
