encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-21 03:19:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix all BytesWarning caught during tests (#5561)

Browse Source 
Running the tests with bytes warning enabled shows some bytes/str
mixups. Fix them all.

Some examples of mixing usage:

str(b'foo') -- calling str() on bytes
b'foo' == 'foo' -- compare str with bytes
'foo' + b'bar' -- concatenating str and bytes
This commit is contained in:
Jon Dufresne 2017-11-06 01:02:48 -08:00 committed by Carlton Gibson
parent 331c31370f
commit f77e794dc8
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/renderers.py
View File

@ -567,6 +567,8 @@ class BrowsableAPIRenderer(BaseRenderer):
if isinstance(field, serializers.HiddenField): if isinstance(field, serializers.HiddenField):
data.pop(name, None) data.pop(name, None)
content = renderer.render(data, accepted, context) content = renderer.render(data, accepted, context)
# Renders returns bytes, but CharField expects a str.
content = content.decode('utf-8')
else: else:
content = None content = None

2
rest_framework/utils/mediatypes.py
View File

@ -83,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) ret += "; %s=%s" % (key, val.decode('ascii'))
return ret return ret

6
tests/test_negotiation.py
View File

@ -77,11 +77,7 @@ 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')
params_str = '' assert str(mediatype) == 'test/*; foo=bar'
for key, val in mediatype.params.items():
params_str += '; %s=%s' % (key, val)
expected = 'test/*' + params_str
assert str(mediatype) == expected
def test_raise_error_if_no_suitable_renderers_found(self): def test_raise_error_if_no_suitable_renderers_found(self):
class MockRenderer(object): class MockRenderer(object):

6
tests/test_renderers.py
View File

@ -676,7 +676,7 @@ class AdminRendererTests(TestCase):
request = factory.get('/') request = factory.get('/')
response = view(request) response = view(request)
response.render() response.render()
self.assertInHTML('<tr><th>Foo</th><td>a string</td></tr>', str(response.content)) self.assertContains(response, '<tr><th>Foo</th><td>a string</td></tr>', html=True)
def test_render_dict_with_items_key(self): def test_render_dict_with_items_key(self):
factory = APIRequestFactory() factory = APIRequestFactory()
@ -691,7 +691,7 @@ class AdminRendererTests(TestCase):
request = factory.get('/') request = factory.get('/')
response = view(request) response = view(request)
response.render() response.render()
self.assertInHTML('<tr><th>Items</th><td>a string</td></tr>', str(response.content)) self.assertContains(response, '<tr><th>Items</th><td>a string</td></tr>', html=True)
def test_render_dict_with_iteritems_key(self): def test_render_dict_with_iteritems_key(self):
factory = APIRequestFactory() factory = APIRequestFactory()
@ -706,7 +706,7 @@ class AdminRendererTests(TestCase):
request = factory.get('/') request = factory.get('/')
response = view(request) response = view(request)
response.render() response.render()
self.assertInHTML('<tr><th>Iteritems</th><td>a string</td></tr>', str(response.content)) self.assertContains(response, '<tr><th>Iteritems</th><td>a string</td></tr>', html=True)
class TestDocumentationRenderer(TestCase): class TestDocumentationRenderer(TestCase):