5 commits

Author	SHA1	Message	Date
Ezio Melotti	2623a37852	Merged revisions 86596 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line #9424: Replace deprecated assert* methods in the Python test suite. ........	2010-11-21 13:34:58 +00:00
Barry Warsaw	fa6582752a	Issue 10038. Restore the Python 2.6 behavior that json.loads() always returns ... unicode. Patch by Patch by Walter Dörwald.	2010-11-02 21:03:09 +00:00
Raymond Hettinger	91852ca673	Issue 5381: Add object_pairs_hook to the json module.	2009-03-19 19:19:03 +00:00
Bob Ippolito	d914e3f861	merge json library with simplejson 2.0.9 (issue 4136)	2009-03-17 23:19:00 +00:00
Brett Cannon	4b964f9c90	Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob ... Ippolito. Closes issue #2750.	2008-05-05 20:21:38 +00:00