summaryrefslogtreecommitdiff
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
* Recorded merge of revisions 85543 via svnmerge fromGeorg Brandl2010-10-151-0/+14
* #7092: fix DeprecationWarnings for json when the tests are run with -3 -Wd.Ezio Melotti2010-01-261-2/+4
* Issue 5381: Add object_pairs_hook to the json module.Raymond Hettinger2009-03-191-4/+11
* merge json library with simplejson 2.0.9 (issue 4136)Bob Ippolito2009-03-171-126/+143
* Intern static stringChristian Heimes2008-05-061-11/+1
* Add the 'json' package. Code taken from simplejson 1.9 and contributed by BobBrett Cannon2008-05-051-0/+349