Ticket #27895: patch_stable:1.10.x.diff

django/test/client.py

@@ -683 +683 @@
                 'Content-Type header is "{0}", not "application/json"'
                 .format(response.get('Content-Type'))
             )
-        return json.loads(response.content.decode(), **extra)
+        return json.loads(response.content.decode('utf-8'), **extra)
 
     def _handle_redirects(self, response, **extra):
         "Follows any redirects by requesting responses from the server using GET."

tests/test_client_regress/tests.py

@@ -1204 +1204 @@
         response = self.client.get('/json_response/')
         self.assertEqual(response.json(), {'key': 'value'})
 
+    def test_unicode_json(self):
+        response = self.client.get('/unicode_json_response/')
+        self.assertEqual(response.json(), {'峠': 'とうげ tōge "mountain pass"'})
+
+
     def test_json_wrong_header(self):
         response = self.client.get('/body/')
         msg = 'Content-Type header is "text/html; charset=utf-8", not "application/json"'

tests/test_client_regress/urls.py

@@ -31 +31 @@
     url(r'^check_unicode/$', views.return_unicode),
     url(r'^check_binary/$', views.return_undecodable_binary),
     url(r'^json_response/$', views.return_json_response),
+    url(r'^unicode_json_response/$', views.return_unicode_json_response),
     url(r'^parse_unicode_json/$', views.return_json_file),
     url(r'^check_headers/$', views.check_headers),
     url(r'^check_headers_redirect/$', RedirectView.as_view(url='/check_headers/')),

tests/test_client_regress/views.py

@@ +1 @@
+# -*- coding:utf-8 -*-
+
 import json
 
 from django.conf import settings
@@ -111 +113 @@
     return JsonResponse({'key': 'value'})
 
 
+def return_unicode_json_response(request):
+    content_type = request.GET.get('content_type')
+    kwargs = {'content_type': content_type} if content_type else {}
+    kwargs['json_dumps_params'] = {'ensure_ascii': False}
+    return JsonResponse({'峠': 'とうげ tōge "mountain pass"'}, **kwargs)
+
+
 def return_json_file(request):
     "A view that parses and returns a JSON string as a file."
     match = CONTENT_TYPE_RE.match(request.META['CONTENT_TYPE'])