summaryrefslogtreecommitdiffstats
path: root/Lib/json
Commit message (Expand)AuthorAgeFilesLines
* convert old fail* assertions to assert*Benjamin Peterson2009-06-302-4/+4
* * Fix-up a TODO (support the sort_key option).Raymond Hettinger2009-05-272-1/+6
* Issue 6105: json encoder to respect iteration order of its inputs.Raymond Hettinger2009-05-271-0/+8
* Merged revisions 72314 via svnmerge fromGeorg Brandl2009-05-051-0/+3
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-0212-529/+555
* Forward port r70471: Add object_pairs_hook. Issue 5381.Raymond Hettinger2009-04-214-8/+54
* merge r66932 and add a few py3k only checksBenjamin Peterson2008-10-162-2/+13
* #2834: Change re module semantics, so that str and bytes mixing is forbidden,Antoine Pitrou2008-08-191-1/+1
* Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge...Christian Heimes2008-05-081-7/+7
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-0821-0/+1774