summaryrefslogtreecommitdiff
path: root/Lib/json/__init__.py
Commit message (Expand)AuthorAgeFilesLines
* Recorded merge of revisions 85543 via svnmerge fromGeorg Brandl2010-10-151-4/+20
* Issue 5381: fix regression in pure python code path, Issue 5584: fix a decode...Bob Ippolito2009-03-291-1/+2
* Issue 5381: Add object_pairs_hook to the json module.Raymond Hettinger2009-03-191-5/+8
* merge json library with simplejson 2.0.9 (issue 4136)Bob Ippolito2009-03-171-54/+55
* Add the 'json' package. Code taken from simplejson 1.9 and contributed by BobBrett Cannon2008-05-051-0/+318