Ticket #13182: noTrailingWhitespace.diff

django/core/serializers/json.py

@@ -36 +36 @@
         if self.options.get("indent"):
             self.stream.write("\n")
         self.stream.write("]")
-        if self.options.get("indent"):
-            self.stream.write("\n")
 
     def end_object(self, obj):
         # self._current has the field data

tests/serializers/tests.py

@@ -389 +389 @@
                 ret_list.append(obj_dict["fields"][field_name])
         return ret_list
 
+_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)
+
 class JsonSerializerTransactionTestCase(SerializersTransactionTestBase, TransactionTestCase):
     serializer_name = "json"
     fwd_ref_str = """[