Commit0fe61d0

authored

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

It now preserves the order of keys.

1 parent2b38a9a commit0fe61d0Copy full SHA for 0fe61d0

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+importcollections`
`1`	`2`	`fromtest.test_jsonimportPyTest,CTest`
`2`	`3`
`3`	`4`
`@@ -7,6 +8,16 @@ def test_default(self):`
`7`	`8`	`self.dumps(type,default=repr),`
`8`	`9`	`self.dumps(repr(type)))`
`9`	`10`
	`11`	`+deftest_ordereddict(self):`
	`12`	`+od=collections.OrderedDict(a=1,b=2,c=3,d=4)`
	`13`	`+od.move_to_end('b')`
	`14`	`+self.assertEqual(`
	`15`	`+self.dumps(od),`
	`16`	`+'{"a": 1, "c": 3, "d": 4, "b": 2}')`
	`17`	`+self.assertEqual(`
	`18`	`+self.dumps(od,sort_keys=True),`
	`19`	`+'{"a": 1, "b": 2, "c": 3, "d": 4}')`
	`20`	`+`
`10`	`21`
`11`	`22`	`classTestPyDefault(TestDefault,PyTest):pass`
`12`	`23`	`classTestCDefault(TestDefault,CTest):pass`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix JSON serialization of OrderedDict. It now preserves the order of keys.`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1570,10 +1570,9 @@ encoder_listencode_dict(PyEncoderObject s, _PyUnicodeWriter writer,`
`1570`	`1570`	`*/`
`1571`	`1571`	`}`
`1572`	`1572`
`1573`		`-if (s->sort_keys) {`
`1574`		`-`
`1575`		`-items=PyDict_Items(dct);`
`1576`		`-if (items==NULL\|\|PyList_Sort(items)<0)`
	`1573`	`+if (s->sort_keys\|\| !PyDict_CheckExact(dct)) {`
	`1574`	`+items=PyMapping_Items(dct);`
	`1575`	`+if (items==NULL\|\| (s->sort_keys&&PyList_Sort(items)<0))`
`1577`	`1576`	`gotobail;`
`1578`	`1577`
`1579`	`1578`	`for (Py_ssize_ti=0;i<PyList_GET_SIZE(items);i++) {`

Comments

(0)