Commite2a9a3f

and

authored

[3.13]gh-131884: Fix incorrect formatting in json.dumps() when using indent and skipkeys=True (GH-132200) (GH-135061)

(cherry picked from commitec12559)Co-authored-by: Roei Ben Artzi <155478676+roeibenartzi@users.noreply.github.com>

1 parent5a69d4f commite2a9a3fCopy full SHA for e2a9a3f

File tree

+22

-7

lines changed

+22

-7

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,6 @@ def _iterencode_dict(dct, _current_indent_level):`
`345`	`345`	`_current_indent_level+=1`
`346`	`346`	`newline_indent='\n'+_indent*_current_indent_level`
`347`	`347`	`item_separator=_item_separator+newline_indent`
`348`		`-yieldnewline_indent`
`349`	`348`	`else:`
`350`	`349`	`newline_indent=None`
`351`	`350`	`item_separator=_item_separator`
`@@ -378,6 +377,8 @@ def _iterencode_dict(dct, _current_indent_level):`
`378`	`377`	`f'not{key.__class__.__name__}')`
`379`	`378`	`iffirst:`
`380`	`379`	`first=False`
	`380`	`+ifnewline_indentisnotNone:`
	`381`	`+yieldnewline_indent`
`381`	`382`	`else:`
`382`	`383`	`yielditem_separator`
`383`	`384`	`yield_encoder(key)`
`@@ -404,7 +405,7 @@ def _iterencode_dict(dct, _current_indent_level):`
`404`	`405`	`else:`
`405`	`406`	`chunks=_iterencode(value,_current_indent_level)`
`406`	`407`	`yieldfromchunks`
`407`		`-ifnewline_indentisnotNone:`
	`408`	`+ifnotfirstandnewline_indentisnotNone:`
`408`	`409`	`_current_indent_level-=1`
`409`	`410`	`yield'\n'+_indent*_current_indent_level`
`410`	`411`	`yield'}'`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,14 @@ def test_dump_skipkeys(self):`
`22`	`22`	`self.assertIn('valid_key',o)`
`23`	`23`	`self.assertNotIn(b'invalid_key',o)`
`24`	`24`
	`25`	`+deftest_dump_skipkeys_indent_empty(self):`
	`26`	`+v= {b'invalid_key':False}`
	`27`	`+self.assertEqual(self.json.dumps(v,skipkeys=True,indent=4),'{}')`
	`28`	`+`
	`29`	`+deftest_skipkeys_indent(self):`
	`30`	`+v= {b'invalid_key':False,'valid_key':True}`
	`31`	`+self.assertEqual(self.json.dumps(v,skipkeys=True,indent=4),'{\n "valid_key": true\n}')`
	`32`	`+`
`25`	`33`	`deftest_encode_truefalse(self):`
`26`	`34`	`self.assertEqual(self.dumps(`
`27`	`35`	`{True:False,False:True},sort_keys=True),`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix formatting issues in:func:`json.dump` when both indent and skipkeys are used.

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1514,6 +1514,12 @@ encoder_encode_key_value(PyEncoderObject s, _PyUnicodeWriter writer, bool *fir`
`1514`	`1514`
`1515`	`1515`	`if (*first) {`
`1516`	`1516`	`*first= false;`
	`1517`	`+if (s->indent!=Py_None) {`
	`1518`	`+if (_PyUnicodeWriter_WriteStr(writer,newline_indent)<0) {`
	`1519`	`+Py_DECREF(keystr);`
	`1520`	`+return-1;`
	`1521`	`+ }`
	`1522`	`+ }`
`1517`	`1523`	`}`
`1518`	`1524`	`else {`
`1519`	`1525`	`if (_PyUnicodeWriter_WriteStr(writer,item_separator)<0) {`
`@@ -1586,9 +1592,6 @@ encoder_listencode_dict(PyEncoderObject s, _PyUnicodeWriter writer,`
`1586`	`1592`	`}`
`1587`	`1593`	`// update item separator with a borrowed reference`
`1588`	`1594`	`current_item_separator=separator_indent;`
`1589`		`-if (_PyUnicodeWriter_WriteStr(writer,new_newline_indent)<0) {`
`1590`		`- gotobail;`
`1591`		`- }`
`1592`	`1595`	`}`
`1593`	`1596`
`1594`	`1597`	`if (s->sort_keys\|\| !PyDict_CheckExact(dct)) {`
`@@ -1632,8 +1635,10 @@ encoder_listencode_dict(PyEncoderObject s, _PyUnicodeWriter writer,`
`1632`	`1635`	`Py_CLEAR(new_newline_indent);`
`1633`	`1636`	`Py_CLEAR(separator_indent);`
`1634`	`1637`
`1635`		`-if (_PyUnicodeWriter_WriteStr(writer,newline_indent)<0) {`
`1636`		`- gotobail;`
	`1638`	`+if (!first) {`
	`1639`	`+if (_PyUnicodeWriter_WriteStr(writer,newline_indent)<0) {`
	`1640`	`+ gotobail;`
	`1641`	`+ }`
`1637`	`1642`	`}`
`1638`	`1643`	`}`
`1639`	`1644`

Comments

(0)