summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merged revisions 76708 via svnmerge fromAntoine Pitrou2009-12-081-2/+11
* convert old fail* assertions to assert*Benjamin Peterson2009-06-302-4/+4
* * Fix-up a TODO (support the sort_key option).Raymond Hettinger2009-05-271-0/+5
* 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-027-66/+83
* Forward port r70471: Add object_pairs_hook. Issue 5381.Raymond Hettinger2009-04-212-0/+35
* merge r66932 and add a few py3k only checksBenjamin Peterson2008-10-161-0/+7
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-0816-0/+627