Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-100272: Fix JSON serialization of OrderedDict (GH-100273) 

It now preserves the order of keys.
This commit is contained in:
Serhiy Storchaka 2022-12-17 14:32:48 +02:00 committed by GitHub
parent 2b38a9aa74
commit 0fe61d0838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_json/test_default.py
View File

@ -1,3 +1,4 @@
import collections
from test.test_json import PyTest, CTest from test.test_json import PyTest, CTest
@ -7,6 +8,16 @@ class TestDefault:
self.dumps(type, default=repr), self.dumps(type, default=repr),
self.dumps(repr(type))) self.dumps(repr(type)))
def test_ordereddict(self):
od = collections.OrderedDict(a=1, b=2, c=3, d=4)
od.move_to_end('b')
self.assertEqual(
self.dumps(od),
'{"a": 1, "c": 3, "d": 4, "b": 2}')
self.assertEqual(
self.dumps(od, sort_keys=True),
'{"a": 1, "b": 2, "c": 3, "d": 4}')
class TestPyDefault(TestDefault, PyTest): pass class TestPyDefault(TestDefault, PyTest): pass
class TestCDefault(TestDefault, CTest): pass class TestCDefault(TestDefault, CTest): pass

1
Misc/NEWS.d/next/Library/2022-12-15-18-28-13.gh-issue-100272.D1O9Ey.rst Normal file
View File

@ -0,0 +1 @@
Fix JSON serialization of OrderedDict. It now preserves the order of keys.

7
Modules/_json.c
View File

@ -1570,10 +1570,9 @@ encoder_listencode_dict(PyEncoderObject *s, _PyUnicodeWriter *writer,
*/ */
} }
if (s->sort_keys) { if (s->sort_keys || !PyDict_CheckExact(dct)) {
items = PyMapping_Items(dct);
items = PyDict_Items(dct); if (items == NULL || (s->sort_keys && PyList_Sort(items) < 0))
if (items == NULL || PyList_Sort(items) < 0)
goto bail; goto bail;
for (Py_ssize_t i = 0; i < PyList_GET_SIZE(items); i++) { for (Py_ssize_t i = 0; i < PyList_GET_SIZE(items); i++) {