Ticket #13182: 13182.json-white-spaces.diff

django/core/serializers/json.py

@@ -18 +18 @@
     internal_use_only = False
 
     def end_serialization(self):
+        if self.options.get('indent'):
+            # The default is (', ', ': '). To eliminate useless whitespaces
+            # after the comma at the end of each line, 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/tests.py

@@ -360 +360 @@
                 ret_list.append(obj_dict["fields"][field_name])
         return ret_list
 
+    def test_indentation_whitespace(self):
+        """ Ensure that there are no extraneous spaces after the comma at the
+            end of each line.
+            Refs #13182.
+        """
+        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), """[
+  {
+    "pk": 1,
+    "model": "serializers.score",
+    "fields": {
+      "score": 5.0
+    }
+  },
+  {
+    "pk": 2,
+    "model": "serializers.score",
+    "fields": {
+      "score": 6.0
+    }
+  }
+]""")
+    
 class JsonSerializerTransactionTestCase(SerializersTransactionTestBase, TransactionTestCase):
     serializer_name = "json"
     fwd_ref_str = """[