Ticket #10571: unicode_payload.patch

django/test/client.py

@@ -290 +290 @@
         if content_type is MULTIPART_CONTENT:
             post_data = encode_multipart(BOUNDARY, data)
         else:
-            post_data = data
+            # Encode the content so that the byte representation is correct.
+            charset = settings.DEFAULT_CHARSET
+            if 'charset=' in content_type:
+                left, charset = content_type.split('charset=')
+            post_data = data.encode(charset)
 
         parsed = urlparse(path)
         r = {

tests/regressiontests/test_client_regress/views.py

@@ +1 @@
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
 from django.core.exceptions import SuspiciousOperation
@@ -2 +3 @@
 from django.shortcuts import render_to_response
+from django.utils import simplejson
+from django.core.serializers.json import DjangoJSONEncoder
 
@@ -63 +66 @@
 
 def return_unicode(request):
     return render_to_response('unicode.html')
+
+def return_json_file(request):
+    "A view that parses and returns a JSON string as a file."    
+    charset = settings.DEFAULT_CHARSET
+    if 'charset=' in request.META['CONTENT_TYPE']:
+        left, charset = request.META['CONTENT_TYPE'].split('charset=')
+
+    # This just checks that the uploaded data is JSON
+    obj_dict = simplejson.loads(request.raw_post_data)
+    obj_json = simplejson.dumps(obj_dict, encoding=charset,
+                                cls=DjangoJSONEncoder,
+                                ensure_ascii=False)
+    response =  HttpResponse(obj_json, status=200, 
+                             mimetype='application/json; charset=' + charset)
+    response['Content-Disposition'] = 'attachment; filename=testfile.json'
+    return response

tests/regressiontests/test_client_regress/models.py

@@ -7 +7 @@
 
 from django.test import Client, TestCase
 from django.test.utils import ContextList
+from django.test.client import FakePayload
 from django.core.urlresolvers import reverse
 from django.core.exceptions import SuspiciousOperation
 from django.template import TemplateDoesNotExist, TemplateSyntaxError, Context
@@ -624 +625 @@
         self.assertEqual(response.context['post-bar'], 'bang')
         self.assertEqual(response.context['request-foo'], 'whiz')
         self.assertEqual(response.context['request-bar'], 'bang')
+
+class UnicodePostTests(TestCase):
+    # FakePayload is not intended to be externally accessible.
+    # These are also exercised using the _payload_ tests.
+    def test_simple_fakepayload(self):
+        "Make sure that FakePayload returns what it gets"
+        #Regression test for #10571
+        json = u'{"english": "mountain pass"}'
+        payload = FakePayload(json.encode('utf-8'))
+        self.assertEqual(payload.read().decode('utf-8'), json)
+
+    def test_fakepayload(self):
+        "Make sure that FakePayload returns what it gets, outside of ASCII"
+        #Regression test for #10571
+        json = u'{"japanese": "\u5ce0 (\u3068\u3046\u3052 t\u014dge)"}'
+        payload = FakePayload(json.encode('utf-8'))
+        self.assertEqual(payload.read().decode('utf-8'), json)
+
+    def test_simple_unicode_payload(self):
+        "Test POSTing a simple JSON document"
+        #Regression test for #10571
+        json = u'{"english": "mountain pass"}'
+        response = self.client.post("/test_client_regress/parse_unicode_json/", json,
+                                    content_type="application/json")
+        # N.B: This relys on the simplejson formatting
+        self.assertEqual(response.content, json)
+
+    def test_unicode_payload_utf8(self):
+        "Test POSTing data outside of ASCII"
+        #Regression test for #10571
+        json = u'{"dog": "собака"}'
+        response = self.client.post("/test_client_regress/parse_unicode_json/", json,
+                                    content_type="application/json; charset=utf-8")
+        # N.B: This relys on the simplejson formatting
+        self.assertEqual(response.content.decode('utf-8'), json)
+
+    def test_unicode_payload_kio8(self):
+        "Test POSTing data outside of ASCII and UTF-8"
+        #Regression test for #10571
+        json = u'{"dog": "\u044f\u2502\u043f\u256c\u043f\u2560\u043f\u255f\u043f\u2568\u043f\u255f"}'
+        response = self.client.post("/test_client_regress/parse_unicode_json/", json,
+                                    content_type="application/json; charset=koi8-r")
+        # N.B: This relys on the simplejson formatting
+        self.assertEqual(response.content.decode('koi8-r'), json)

tests/regressiontests/test_client_regress/urls.py

@@ -23 +23 @@
     (r'^check_session/$', views.check_session_view),
     (r'^request_methods/$', views.request_methods_view),
     (r'^check_unicode/$', views.return_unicode),
+    (r'^parse_unicode_json/$', views.return_json_file),
 )