summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKosei Kitahara <surgo.jp@gmail.com>2016-11-24 19:56:39 +0900
committerTim Graham <timograham@gmail.com>2016-11-24 05:56:39 -0500
commitf095b249baf34bbdd4c0b28c9bde05b4d20681be (patch)
tree9bb474ff5990ac5372481dae3f9087a133f9d397
parentdf2a5227c90d60bdae154ac5acc0436a6ed1f953 (diff)
Fixed #27517 -- Fixed charset param in SimpleTemplateResponse.__init__().
-rw-r--r--django/template/response.py2
-rw-r--r--tests/template_tests/test_response.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/django/template/response.py b/django/template/response.py
index 7d6693aee6..95cb335ab4 100644
--- a/django/template/response.py
+++ b/django/template/response.py
@@ -34,7 +34,7 @@ class SimpleTemplateResponse(HttpResponse):
# content argument doesn't make sense here because it will be replaced
# with rendered template so we always pass empty string in order to
# 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
# into a final response.
diff --git a/tests/template_tests/test_response.py b/tests/template_tests/test_response.py
index c148b2dc44..60839f5c6b 100644
--- a/tests/template_tests/test_response.py
+++ b/tests/template_tests/test_response.py
@@ -122,9 +122,10 @@ class SimpleTemplateResponseTest(SimpleTestCase):
self.assertEqual(response.content, b'bar')
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.status_code, 504)
+ self.assertEqual(response.charset, 'ascii')
def test_args(self):
response = SimpleTemplateResponse('', {}, 'application/json', 504)