aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/negotiation.py
diff options
context:
space:
mode:
Diffstat (limited to 'rest_framework/negotiation.py')
-rw-r--r--rest_framework/negotiation.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py
index ee2800a6..0694d35f 100644
--- a/rest_framework/negotiation.py
+++ b/rest_framework/negotiation.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
from django.http import Http404
from rest_framework import exceptions
from rest_framework.settings import api_settings
@@ -33,7 +34,7 @@ class DefaultContentNegotiation(BaseContentNegotiation):
"""
# Allow URL style format override. eg. "?format=json
format_query_param = self.settings.URL_FORMAT_OVERRIDE
- format = format_suffix or request.GET.get(format_query_param)
+ format = format_suffix or request.QUERY_PARAMS.get(format_query_param)
if format:
renderers = self.filter_renderers(renderers, format)
@@ -80,5 +81,5 @@ class DefaultContentNegotiation(BaseContentNegotiation):
Allows URL style accept override. eg. "?accept=application/json"
"""
header = request.META.get('HTTP_ACCEPT', '*/*')
- header = request.GET.get(self.settings.URL_ACCEPT_OVERRIDE, header)
+ header = request.QUERY_PARAMS.get(self.settings.URL_ACCEPT_OVERRIDE, header)
return [token.strip() for token in header.split(',')]