Handle newlines consistently in Django@main too

matthiask · matthiask · commit 8e8b8618c21d · 2025-03-14T10:56:08.000+01:00
diff --git a/feincms3_data/data.py b/feincms3_data/data.py
@@ -100,8 +100,7 @@ def dump_specs(specs, *, mappers=None, objects=None):
             _model_queryset(spec).distinct() for spec in specs
         )
     serializer.serialize(objects, stream=stream)
-    stream.write("}\n")
-    return stream.getvalue()
+    return stream.getvalue().rstrip("\n") + "}\n"
 
 
 def load_dump(
diff --git a/tests/testapp/test_data.py b/tests/testapp/test_data.py
@@ -1,7 +1,5 @@
 import json
-from unittest import skipIf
 
-import django
 from django.db import models
 from django.test import TransactionTestCase
 
@@ -647,10 +645,6 @@ def test_mti(self):
             ],
         )
 
-    @skipIf(
-        django.VERSION > (6,),
-        "Django changed the JSON dump format to include a final newline.",
-    )
     def test_json_format(self):
         """The exact format generated by dump_specs shouldn't change without us noticing"""
 

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,7 @@ def dump_specs(specs, *, mappers=None, objects=None):`
`100`	`100`	`_model_queryset(spec).distinct() for spec in specs`
`101`	`101`	`)`
`102`	`102`	`serializer.serialize(objects, stream=stream)`
`103`		`- stream.write("}\n")`
`104`		`- return stream.getvalue()`
	`103`	`+ return stream.getvalue().rstrip("\n") + "}\n"`
`105`	`104`
`106`	`105`
`107`	`106`	`def load_dump(`