mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-06 20:19:13 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #36177 -- Added a trailing newline to JSON serializer. (#19232)

Browse Source
This commit is contained in:
Tom Carrick 2025-03-11 08:01:06 +01:00 committed by GitHub
parent ab148c02ce
commit 8df5ce80d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
22 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.editorconfig
View File

@ -18,11 +18,6 @@ max_line_length = 88
[*.html] [*.html]
indent_size = 2 indent_size = 2
# The JSON files contain newlines inconsistently
[*.json]
indent_size = 2
insert_final_newline = ignore
[**/admin/js/vendor/**] [**/admin/js/vendor/**]
indent_style = ignore indent_style = ignore
indent_size = ignore indent_size = ignore

1
django/core/serializers/json.py
View File

@ -39,7 +39,6 @@ class Serializer(PythonSerializer):
if self.options.get("indent"): if self.options.get("indent"):
self.stream.write("\n") self.stream.write("\n")
self.stream.write("]") self.stream.write("]")
if self.options.get("indent"):
self.stream.write("\n") self.stream.write("\n")
def end_object(self, obj): def end_object(self, obj):

3
docs/releases/6.0.txt
View File

@ -293,7 +293,8 @@ of each library are the first to add or confirm compatibility with Python 3.12:
Miscellaneous Miscellaneous
------------- -------------
* ... * The :ref:`JSON <serialization-formats-json>` serializer now writes a newline
at the end of the output, even without the ``indent`` option set.
.. _deprecated-features-6.0: .. _deprecated-features-6.0:

3
tests/serializers/tests.py
View File

@ -489,7 +489,8 @@ class SerializerAPITests(SimpleTestCase):
self.assertIs(serializer.stream_class, File) self.assertIs(serializer.stream_class, File)
self.assertIsInstance(serializer.stream, File) self.assertIsInstance(serializer.stream, File)
self.assertEqual( self.assertEqual(
data, '[{"model": "serializers.score", "pk": 1, "fields": {"score": 3.4}}]' data,
'[{"model": "serializers.score", "pk": 1, "fields": {"score": 3.4}}]\n',
) )