Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

Fixed #27517 -- Fixed charset param in SimpleTemplateResponse.__init__().

Browse Source
This commit is contained in:
Kosei Kitahara 2016-11-24 19:56:39 +09:00 committed by Tim Graham
parent df2a5227c9
commit f095b249ba
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/template/response.py
View File

@ -34,7 +34,7 @@ class SimpleTemplateResponse(HttpResponse):
# content argument doesn't make sense here because it will be replaced # content argument doesn't make sense here because it will be replaced
# with rendered template so we always pass empty string in order to # with rendered template so we always pass empty string in order to
# prevent errors and provide shorter signature. # prevent errors and provide shorter signature.
super(SimpleTemplateResponse, self).__init__('', content_type, status, charset) super(SimpleTemplateResponse, self).__init__('', content_type, status, charset=charset)
# _is_rendered tracks whether the template and context has been baked # _is_rendered tracks whether the template and context has been baked
# into a final response. # into a final response.

3
tests/template_tests/test_response.py
View File

@ -122,9 +122,10 @@ class SimpleTemplateResponseTest(SimpleTestCase):
self.assertEqual(response.content, b'bar') self.assertEqual(response.content, b'bar')
def test_kwargs(self): def test_kwargs(self):
response = self._response(content_type='application/json', status=504) response = self._response(content_type='application/json', status=504, charset='ascii')
self.assertEqual(response['content-type'], 'application/json') self.assertEqual(response['content-type'], 'application/json')
self.assertEqual(response.status_code, 504) self.assertEqual(response.status_code, 504)
self.assertEqual(response.charset, 'ascii')
def test_args(self): def test_args(self):
response = SimpleTemplateResponse('', {}, 'application/json', 504) response = SimpleTemplateResponse('', {}, 'application/json', 504)