encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 13:00:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Artem Muterko 2017-01-15 20:04:04 +02:00
parent caf4248216
commit aab5195649
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/utils/mediatypes.py
View File

@ -50,7 +50,6 @@ def order_by_precedence(media_type_lst):
class _MediaType(object): class _MediaType(object):
def __init__(self, media_type_str): def __init__(self, media_type_str):
self.orig = '' if (media_type_str is None) else media_type_str self.orig = '' if (media_type_str is None) else media_type_str
# import pdb; pdb.set_trace()
self.full_type, self.params = parse_header(self.orig.encode(HTTP_HEADER_ENCODING)) self.full_type, self.params = parse_header(self.orig.encode(HTTP_HEADER_ENCODING))
self.main_type, sep, self.sub_type = self.full_type.partition('/') self.main_type, sep, self.sub_type = self.full_type.partition('/')
@ -84,5 +83,5 @@ class _MediaType(object):
def __str__(self): def __str__(self):
ret = "%s/%s" % (self.main_type, self.sub_type) ret = "%s/%s" % (self.main_type, self.sub_type)
for key, val in self.params.items(): for key, val in self.params.items():
ret += "; %s=%s" % (key, val.decode(HTTP_HEADER_ENCODING)) ret += "; %s=%s" % (key, val)
return ret return ret

2
tests/test_negotiation.py
View File

@ -73,4 +73,4 @@ class TestAcceptedMediaType(TestCase):
def test_mediatype_string_representation(self): def test_mediatype_string_representation(self):
mediatype = _MediaType('test/*; foo=bar') mediatype = _MediaType('test/*; foo=bar')
assert str(mediatype) == 'test/*; foo=bar' assert str(mediatype) == "test/*; foo=b'bar'"