encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-24 00:04:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2868 from ticosax/versioning-header-all

Browse Source 
Check AcceptHeaderVersioning with content negotiation in place
This commit is contained in:
Tom Christie 2015-04-24 15:19:51 +01:00
commit 450c541462
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/negotiation.py
View File

@ -4,7 +4,7 @@ incoming request. Typically this will be based on the request's Accept header.
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
from django.http import Http404 from django.http import Http404
from rest_framework import exceptions from rest_framework import HTTP_HEADER_ENCODING, exceptions
from rest_framework.settings import api_settings from rest_framework.settings import api_settings
from rest_framework.utils.mediatypes import order_by_precedence, media_type_matches from rest_framework.utils.mediatypes import order_by_precedence, media_type_matches
from rest_framework.utils.mediatypes import _MediaType from rest_framework.utils.mediatypes import _MediaType
@ -54,13 +54,19 @@ class DefaultContentNegotiation(BaseContentNegotiation):
for media_type in media_type_set: for media_type in media_type_set:
if media_type_matches(renderer.media_type, media_type): if media_type_matches(renderer.media_type, media_type):
# Return the most specific media type as accepted. # Return the most specific media type as accepted.
media_type_wrapper = _MediaType(media_type)
if ( if (
_MediaType(renderer.media_type).precedence > _MediaType(renderer.media_type).precedence >
_MediaType(media_type).precedence media_type_wrapper.precedence
): ):
# Eg client requests '*/*' # Eg client requests '*/*'
# Accepted media type is 'application/json' # Accepted media type is 'application/json'
return renderer, renderer.media_type full_media_type = ';'.join(
(renderer.media_type,) +
tuple('{0}={1}'.format(
key, value.decode(HTTP_HEADER_ENCODING))
for key, value in media_type_wrapper.params.items()))
return renderer, full_media_type
else: else:
# Eg client requests 'application/json; indent=8' # Eg client requests 'application/json; indent=8'
# Accepted media type is 'application/json; indent=8' # Accepted media type is 'application/json; indent=8'

4
tests/test_versioning.py
View File

@ -82,6 +82,10 @@ class TestRequestVersion:
response = view(request) response = view(request)
assert response.data == {'version': '1.2.3'} assert response.data == {'version': '1.2.3'}
request = factory.get('/endpoint/', HTTP_ACCEPT='*/*; version=1.2.3')
response = view(request)
assert response.data == {'version': '1.2.3'}
request = factory.get('/endpoint/', HTTP_ACCEPT='application/json') request = factory.get('/endpoint/', HTTP_ACCEPT='application/json')
response = view(request) response = view(request)
assert response.data == {'version': None} assert response.data == {'version': None}