summaryrefslogtreecommitdiffstats
path: root/Lib/json/decoder.py
Commit message (Expand)AuthorAgeFilesLines
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-021-139/+132
* Forward port r70471: Add object_pairs_hook. Issue 5381.Raymond Hettinger2009-04-211-3/+11
* merge r66932 and add a few py3k only checksBenjamin Peterson2008-10-161-2/+6
* #2834: Change re module semantics, so that str and bytes mixing is forbidden,Antoine Pitrou2008-08-191-1/+1
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-081-0/+339