Ticket #25468: 25468.diff

django/core/serializers/json.py

@@ -16 +16 @@
     Deserializer as PythonDeserializer, Serializer as PythonSerializer,
 )
 from django.utils import six
+from django.utils.functional import Promise
 from django.utils.timezone import is_aware
 
 
@@ -111 +112 @@
             return str(o)
         elif isinstance(o, uuid.UUID):
             return str(o)
+        elif isinstance(o, Promise):
+            return six.text_type(o)
         else:
             return super(DjangoJSONEncoder, self).default(o)
 

tests/serializers/test_json.py

@@ -6 +6 @@
 
 from django.core import serializers
 from django.core.serializers.base import DeserializationError
-from django.test import TestCase, TransactionTestCase
+from django.core.serializers.json import DjangoJSONEncoder
+from django.test import SimpleTestCase, TestCase, TransactionTestCase
+from django.utils.translation import override, ugettext_lazy
 
 from .models import Score
 from .tests import SerializersTestBase, SerializersTransactionTestBase
@@ -271 +273 @@
             "name": "Agnes"
         }
     }]"""
+
+
+class DjangoJSONEncoderTests(SimpleTestCase):
+    def test_lazy_string_encoding(self):
+        self.assertEqual(
+            json.dumps({'lang': ugettext_lazy("French")}, cls=DjangoJSONEncoder),
+            '{"lang": "French"}'
+        )
+        with override('fr'):
+            self.assertEqual(
+                json.dumps({'lang': ugettext_lazy("French")}, cls=DjangoJSONEncoder),
+                '{"lang": "Fran\\u00e7ais"}'
+            )