Commitec12559

authored

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

1 parent485b499 commitec12559Copy full SHA for ec12559

File tree

+20

-7

lines changed

+20

-7

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,6 @@ def _iterencode_dict(dct, _current_indent_level):`
`348`	`348`	`_current_indent_level+=1`
`349`	`349`	`newline_indent='\n'+_indent*_current_indent_level`
`350`	`350`	`item_separator=_item_separator+newline_indent`
`351`		`-yieldnewline_indent`
`352`	`351`	`else:`
`353`	`352`	`newline_indent=None`
`354`	`353`	`item_separator=_item_separator`
`@@ -381,6 +380,8 @@ def _iterencode_dict(dct, _current_indent_level):`
`381`	`380`	`f'not{key.__class__.__name__}')`
`382`	`381`	`iffirst:`
`383`	`382`	`first=False`
	`383`	`+ifnewline_indentisnotNone:`
	`384`	`+yieldnewline_indent`
`384`	`385`	`else:`
`385`	`386`	`yielditem_separator`
`386`	`387`	`yield_encoder(key)`
`@@ -413,7 +414,7 @@ def _iterencode_dict(dct, _current_indent_level):`
`413`	`414`	`exceptBaseExceptionasexc:`
`414`	`415`	`exc.add_note(f'when serializing{type(dct).__name__} item{key!r}')`
`415`	`416`	`raise`
`416`		`-ifnewline_indentisnotNone:`
	`417`	`+ifnotfirstandnewline_indentisnotNone:`
`417`	`418`	`_current_indent_level-=1`
`418`	`419`	`yield'\n'+_indent*_current_indent_level`
`419`	`420`	`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: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1603,6 +1603,12 @@ encoder_encode_key_value(PyEncoderObject s, PyUnicodeWriter writer, bool *firs`
`1603`	`1603`
`1604`	`1604`	`if (*first) {`
`1605`	`1605`	`*first= false;`
	`1606`	`+if (s->indent!=Py_None) {`
	`1607`	`+if (write_newline_indent(writer,indent_level,indent_cache)<0) {`
	`1608`	`+Py_DECREF(keystr);`
	`1609`	`+return-1;`
	`1610`	`+ }`
	`1611`	`+ }`
`1606`	`1612`	`}`
`1607`	`1613`	`else {`
`1608`	`1614`	`if (PyUnicodeWriter_WriteStr(writer,item_separator)<0) {`
`@@ -1670,11 +1676,8 @@ encoder_listencode_dict(PyEncoderObject s, PyUnicodeWriter writer,`
`1670`	`1676`	`if (s->indent!=Py_None) {`
`1671`	`1677`	`indent_level++;`
`1672`	`1678`	`separator=get_item_separator(s,indent_level,indent_cache);`
`1673`		`-if (separator==NULL\|\|`
`1674`		`-write_newline_indent(writer,indent_level,indent_cache)<0)`
`1675`		`- {`
	`1679`	`+if (separator==NULL)`
`1676`	`1680`	`gotobail;`
`1677`		`- }`
`1678`	`1681`	`}`
`1679`	`1682`
`1680`	`1683`	`if (s->sort_keys\|\| !PyDict_CheckExact(dct)) {`
`@@ -1714,7 +1717,7 @@ encoder_listencode_dict(PyEncoderObject s, PyUnicodeWriter writer,`
`1714`	`1717`	`gotobail;`
`1715`	`1718`	`Py_CLEAR(ident);`
`1716`	`1719`	`}`
`1717`		`-if (s->indent!=Py_None) {`
	`1720`	`+if (s->indent!=Py_None&& !first) {`
`1718`	`1721`	`indent_level--;`
`1719`	`1722`	`if (write_newline_indent(writer,indent_level,indent_cache)<0) {`
`1720`	`1723`	`gotobail;`

Comments

(0)