summaryrefslogtreecommitdiffstats
path: root/Modules/_json.c
Commit message (Expand)AuthorAgeFilesLines
* #12051: merge with 3.1.Ezio Melotti2011-05-101-2/+15
|\
| * #12051: Fix segfault in json.dumps() while encoding highly-nested objects usi...Ezio Melotti2011-05-101-2/+15
* | #12017: merge with 3.1.Ezio Melotti2011-05-071-2/+13
|\ \ | |/
| * #12017: Fix segfault in json.loads() while decoding highly-nested objects usi...Ezio Melotti2011-05-071-2/+13
| * Merged revisions 85342 via svnmerge fromAntoine Pitrou2010-10-091-1/+1
| * Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-...Georg Brandl2010-10-061-3/+3
| * Merged revisions 83016 via svnmerge fromDoug Hellmann2010-07-211-1/+1
| * Recorded merge of revisions 81032 via svnmerge fromAntoine Pitrou2010-05-091-18/+18
| * Merged revisions 76710 via svnmerge fromAntoine Pitrou2009-12-081-4/+15
* | Issue #10314: improve performance of JSON encoding with sort_keys=TrueAntoine Pitrou2010-11-041-20/+25
* | Issue #10055: Make json C89-compliant in UCS4 mode.Antoine Pitrou2010-10-091-1/+1
* | Issue #7451: Improve decoding performance of JSON objects, and reduceAntoine Pitrou2010-09-041-45/+82
* | #9087: update json docstrings -- unicode and long do not exist anymore.Georg Brandl2010-08-021-3/+3
* | Apply patch from Ray Allen for issue 9296Doug Hellmann2010-07-211-1/+1
* | Recorded merge of revisions 81029 via svnmerge fromAntoine Pitrou2010-05-091-18/+18
* | Merged revisions 76708 via svnmerge fromAntoine Pitrou2009-12-081-4/+15
|/
* Fix TODO: do the sort by just the key, not the key/value pair.Raymond Hettinger2009-05-271-15/+20
* * Fix-up a TODO (support the sort_key option).Raymond Hettinger2009-05-271-20/+40
* Issue 6105: json encoder to respect iteration order of its inputs.Raymond Hettinger2009-05-271-5/+22
* Merged revisions 72314 via svnmerge fromGeorg Brandl2009-05-051-3/+3
* Fixed warning. (Should not use *const* as variable name)Hirokazu Yamamoto2009-05-021-1/+1
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-021-330/+1377
* Merged revisions 66938,66942 via svnmerge fromBenjamin Peterson2008-10-161-4/+6
* merge r66932 and add a few py3k only checksBenjamin Peterson2008-10-161-4/+6
* #3560: cleanup C memoryview APIAntoine Pitrou2008-08-191-1/+1
* Merged revisions 65654 via svnmerge fromMartin v. Löwis2008-08-131-1/+1
* Merged revisions 65147 via svnmerge fromBenjamin Peterson2008-07-191-2/+10
* Implement PEP 3121: new module initialization and finalization API.Martin v. Löwis2008-06-111-4/+15
* Renamed PyString to PyBytesChristian Heimes2008-05-261-18/+18
* Move variable declaration to the top of the block,Amaury Forgeot d'Arc2008-05-081-1/+2
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-081-0/+620