Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions Lib/test/test_json/test_speedups.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,38 @@ def test(name):
def test_unsortable_keys(self):
with self.assertRaises(TypeError):
self.json.encoder.JSONEncoder(sort_keys=True).encode({'a': 1, 1: 'a'})

def test_current_indent_level(self):
enc = self.json.encoder.c_make_encoder(
markers=None,
default=str,
encoder=self.json.encoder.c_encode_basestring,
indent='\t',
key_separator=': ',
item_separator=', ',
sort_keys=False,
skipkeys=False,
allow_nan=False)
self.assertEqual(enc(['spam', {'ham': 'eggs'}], 0)[0],
'[\n'
'\t"spam", \n'
'\t{\n'
'\t\t"ham": "eggs"\n'
'\t}\n'
']')
self.assertEqual(enc(['spam', {'ham': 'eggs'}], 3)[0],
'[\n'
'\t\t\t\t"spam", \n'
'\t\t\t\t{\n'
'\t\t\t\t\t"ham": "eggs"\n'
'\t\t\t\t}\n'
'\t\t\t]')
self.assertEqual(enc(['spam', {'ham': 'eggs'}], -3)[0],
'[\n'
'\t"spam", \n'
'\t{\n'
'\t\t"ham": "eggs"\n'
'\t}\n'
']')
self.assertRaises(TypeError, enc, ['spam', {'ham': 'eggs'}], 3.0)
self.assertRaises(TypeError, enc, ['spam', {'ham': 'eggs'}])
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix crash when the internal encoder object returned by undocumented function
:func:`!json.encoder.c_make_encoder` was called with non-zero second
(*_current_indent_level*) argument.
1 change: 1 addition & 0 deletions Modules/_json.c
Original file line number Diff line number Diff line change
Expand Up @@ -1459,6 +1459,7 @@ encoder_call(PyObject *op, PyObject *args, PyObject *kwds)
return NULL;
}
}
indent_level = 0;
if (encoder_listencode_obj(self, writer, obj, indent_level, indent_cache)) {
PyUnicodeWriter_Discard(writer);
Py_XDECREF(indent_cache);
Expand Down
Loading