Ticket #17501: fix.patch

core/serializers/json.py

@@ -10 +10 @@
 from django.core.serializers.python import Deserializer as PythonDeserializer
 from django.utils import simplejson
 from django.utils.timezone import is_aware
+from django.utils.functional import Promise
+from django.utils.encoding import force_unicode
 
 class Serializer(PythonSerializer):
     """
@@ -62 +64 @@
             return r
         elif isinstance(o, decimal.Decimal):
             return str(o)
+        elif isinstance(o, Promise):
+            return force_unicode(o)
         else:
             return super(DjangoJSONEncoder, self).default(o)