summaryrefslogtreecommitdiffstats
path: root/Lib/json/decoder.py
Commit message (Expand)AuthorAgeFilesLines
* #9233: Fix json.loads({}) to return a dict (instead of a list), when _json is...Ezio Melotti2011-04-131-0/+6
* #9233: Fix json to work properly even when _json is not available.Ezio Melotti2011-04-131-1/+1
* Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge fromGeorg Brandl2010-11-261-0/+14
* Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-...Georg Brandl2010-10-061-6/+6
* 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