Fixed #29249 -- Made JSON and YAML serializers use Unicode by default.

2 files changed, 8 insertions, 9 deletions

diff --git a/tests/serializers/test_xml.py b/tests/serializers/test_xml.py
index 4bbfcf18b2..b11cfdd864 100644
--- a/tests/serializers/test_xml.py
+++ b/tests/serializers/test_xml.py
@@ -4,7 +4,6 @@ from django.core import serializers
 from django.core.serializers.xml_serializer import DTDForbidden
 from django.test import TestCase, TransactionTestCase
 
-from .models import Author
 from .tests import SerializersTestBase, SerializersTransactionTestBase
 
 
@@ -87,13 +86,6 @@ class XmlSerializerTestCase(SerializersTestBase, TestCase):
         with self.assertRaises(DTDForbidden):
             next(serializers.deserialize('xml', xml))
 
-    def test_unicode_serialization(self):
-        unicode_name = 'יוניקוד'
-        data = serializers.serialize('xml', [Author(name=unicode_name)])
-        self.assertIn(unicode_name, data)
-        objs = list(serializers.deserialize('xml', data))
-        self.assertEqual(objs[0].object.name, unicode_name)
-
 
 class XmlSerializerTransactionTestCase(SerializersTransactionTestBase, TransactionTestCase):
     serializer_name = "xml"
diff --git a/tests/serializers/tests.py b/tests/serializers/tests.py
index 863ee00e89..9d1be81146 100644
--- a/tests/serializers/tests.py
+++ b/tests/serializers/tests.py
@@ -202,7 +202,7 @@ class SerializersTestBase:
         for field_name in valid_fields:
             self.assertTrue(self._get_field_values(serial_str, field_name))
 
-    def test_serialize_unicode(self):
+    def test_serialize_unicode_roundtrip(self):
         """Unicode makes the roundtrip intact"""
         actor_name = "Za\u017c\u00f3\u0142\u0107"
         movie_title = 'G\u0119\u015bl\u0105 ja\u017a\u0144'
@@ -219,6 +219,13 @@ class SerializersTestBase:
         mv_obj = obj_list[0].object
         self.assertEqual(mv_obj.title, movie_title)
 
+    def test_unicode_serialization(self):
+        unicode_name = 'יוניקוד'
+        data = serializers.serialize(self.serializer_name, [Author(name=unicode_name)])
+        self.assertIn(unicode_name, data)
+        objs = list(serializers.deserialize(self.serializer_name, data))
+        self.assertEqual(objs[0].object.name, unicode_name)
+
     def test_serialize_progressbar(self):
         fake_stdout = StringIO()
         serializers.serialize(