Ticket #13182: less-whitespace-json-serialize.diff

django/core/serializers/json.py

@@ -21 +21 @@
         self.options.pop('stream', None)
         self.options.pop('fields', None)
         self.options.pop('use_natural_keys', None)
+        if self.options.get('indent'): 
+            # The default is (', ', ': ').  To eliminate useless whitespaces 
+            # after comma, the representation is changed to (',', ': ') only 
+            # if indent is used 
+            self.options['separators'] = (',', ': ') 
         simplejson.dump(self.objects, self.stream, cls=DjangoJSONEncoder, **self.options)
 
     def getvalue(self):

tests/modeltests/serializers/models.py

@@ -8 +8 @@
 
 from decimal import Decimal
 from django.db import models
+from django.test.testcases import TestCase
 
 class Category(models.Model):
     name = models.CharField(max_length=20)
@@ -342 +343 @@
 except ImportError:
     pass
 
+
+
+_json_expected="""[
+  {
+    "pk": 1,
+    "model": "serializers.score",
+    "fields": {
+      "score": 5.0
+    }
+  },
+  {
+    "pk": 2,
+    "model": "serializers.score",
+    "fields": {
+      "score": 6.0
+    }
+  }
+]"""
+
+
+class TestJsonSerializerIndentation(TestCase):
+    def test_indentation_whitespace(self):
+        from django.core.serializers.json import Serializer
+        Score.objects.create(score=5.0)
+        Score.objects.create(score=6.0)
+        qset = Score.objects.all()
+        
+        s = Serializer()
+        self.assertEqual(s.serialize(qset,indent=2),_json_expected)