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

cast bytes to string, don't shadow variable

Browse Source
This commit is contained in:
tim watts 2017-03-01 22:09:02 +00:00
parent f43e8fa946
commit 81d914238f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/templates/rest_framework/admin/dict_value.html
View File

@ -1,10 +1,10 @@
{% load rest_framework %}
<table class="table table-striped">
<tbody>
{% for key, value in value %}
{% for k, v in value %}
<tr>
<th>{{ key|format_value }}</th>
<td>{{ value|format_value }}</td>
<th>{{ k|format_value }}</th>
<td>{{ v|format_value }}</td>
</tr>
{% endfor %}
</tbody>

8
tests/test_renderers.py
View File

@ -661,7 +661,7 @@ class AdminRendererTests(TestCase):
request = factory.get('/')
response = view(request)
response.render()
self.assertInHTML('<tr><th>Foo</th><td>a string</td></tr>', response.content)
self.assertInHTML('<tr><th>Foo</th><td>a string</td></tr>', str(response.content))
def test_render_dict_with_items_key(self):
@ -677,10 +677,10 @@ class AdminRendererTests(TestCase):
request = factory.get('/')
response = view(request)
response.render()
self.assertInHTML('<tr><th>Items</th><td>a string</td></tr>', response.content)
self.assertInHTML('<tr><th>Items</th><td>a string</td></tr>', str(response.content))
def test_render_dict_with_keys_key(self):
def test_render_dict_with_iteritems_key(self):
factory = APIRequestFactory()
class DummyView(APIView):
@ -693,4 +693,4 @@ class AdminRendererTests(TestCase):
request = factory.get('/')
response = view(request)
response.render()
self.assertInHTML('<tr><th>Iteritems</th><td>a string</td></tr>', response.content)
self.assertInHTML('<tr><th>Iteritems</th><td>a string</td></tr>', str(response.content))