diff options
Diffstat (limited to 'rest_framework/negotiation.py')
| -rw-r--r-- | rest_framework/negotiation.py | 10 | 
1 files changed, 6 insertions, 4 deletions
| diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py index 4d205c0e..1838130a 100644 --- a/rest_framework/negotiation.py +++ b/rest_framework/negotiation.py @@ -38,7 +38,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.QUERY_PARAMS.get(format_query_param) +        format = format_suffix or request.query_params.get(format_query_param)          if format:              renderers = self.filter_renderers(renderers, format) @@ -54,8 +54,10 @@ class DefaultContentNegotiation(BaseContentNegotiation):                  for media_type in media_type_set:                      if media_type_matches(renderer.media_type, media_type):                          # Return the most specific media type as accepted. -                        if (_MediaType(renderer.media_type).precedence > -                            _MediaType(media_type).precedence): +                        if ( +                            _MediaType(renderer.media_type).precedence > +                            _MediaType(media_type).precedence +                        ):                              # Eg client requests '*/*'                              # Accepted media type is 'application/json'                              return renderer, renderer.media_type @@ -85,5 +87,5 @@ class DefaultContentNegotiation(BaseContentNegotiation):          Allows URL style accept override.  eg. "?accept=application/json"          """          header = request.META.get('HTTP_ACCEPT', '*/*') -        header = request.QUERY_PARAMS.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(',')] | 
