5 commits

Author	SHA1	Message	Date
Georg Brandl	db949b8fae	Recorded merge of revisions 85543 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85543 | georg.brandl | 2010-10-15 19:03:02 +0200 (Fr, 15 Okt 2010) | 1 line #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings. ........	2010-10-15 17:04:45 +00:00
Bob Ippolito	76a982a027	Issue 5381: fix regression in pure python code path, Issue 5584: fix a decoder bug for unicode float literals outside of a container	2009-03-29 22:33:58 +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