diff options
| author | Tom Christie | 2012-09-16 21:48:55 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-09-16 21:48:55 +0100 |
| commit | a96211d3d1ba246512af5e32c31726a666c467ac (patch) | |
| tree | f27dc9f1f6900320588bb91fcad76f3366cef815 /djangorestframework/settings.py | |
| parent | 6543ccd244a8d482b8aec18b5d03ee964292f17f (diff) | |
| download | django-rest-framework-a96211d3d1ba246512af5e32c31726a666c467ac.tar.bz2 | |
Simplify negotiation. Drop MSIE hacks. Etc.
Diffstat (limited to 'djangorestframework/settings.py')
| -rw-r--r-- | djangorestframework/settings.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/djangorestframework/settings.py b/djangorestframework/settings.py index 95215712..4dec1a4d 100644 --- a/djangorestframework/settings.py +++ b/djangorestframework/settings.py @@ -38,7 +38,7 @@ DEFAULTS = { ), 'DEFAULT_PERMISSIONS': (), 'DEFAULT_THROTTLES': (), - 'DEFAULT_CONTENT_NEGOTIATION': 'djangorestframework.contentnegotiation.DefaultContentNegotiation', + 'DEFAULT_CONTENT_NEGOTIATION': 'djangorestframework.negotiation.DefaultContentNegotiation', 'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser', 'UNAUTHENTICATED_TOKEN': None, @@ -46,8 +46,8 @@ DEFAULTS = { 'FORM_METHOD_OVERRIDE': '_method', 'FORM_CONTENT_OVERRIDE': '_content', 'FORM_CONTENTTYPE_OVERRIDE': '_content_type', - 'URL_ACCEPT_OVERRIDE': 'accept', - 'IGNORE_MSIE_ACCEPT_HEADER': True, + 'URL_ACCEPT_OVERRIDE': '_accept', + 'URL_FORMAT_OVERRIDE': 'format', 'FORMAT_SUFFIX_KWARG': 'format' } |