From 8457c871963264c9f62552f30307e98221a1c25d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 4 Sep 2012 12:02:05 +0100 Subject: Bits of cleanup --- djangorestframework/utils/mediatypes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'djangorestframework/utils') diff --git a/djangorestframework/utils/mediatypes.py b/djangorestframework/utils/mediatypes.py index 48dca0f0..5eba7fb2 100644 --- a/djangorestframework/utils/mediatypes.py +++ b/djangorestframework/utils/mediatypes.py @@ -53,7 +53,7 @@ def get_media_type_params(media_type): def order_by_precedence(media_type_lst): """ - Returns a list of lists of media type strings, ordered by precedence. + Returns a list of sets of media type strings, ordered by precedence. Precedence is determined by how specific a media type is: 3. 'type/subtype; param=val' @@ -61,11 +61,11 @@ def order_by_precedence(media_type_lst): 1. 'type/*' 0. '*/*' """ - ret = [[], [], [], []] + ret = [set(), set(), set(), set()] for media_type in media_type_lst: precedence = _MediaType(media_type).precedence - ret[3 - precedence].append(media_type) - return ret + ret[3 - precedence].add(media_type) + return [media_types for media_types in ret if media_types] class _MediaType(object): -- cgit v1.2.3