summaryrefslogtreecommitdiffstats
path: root/Lib/json/__init__.py
Commit message (Collapse)AuthorAgeFilesLines
* Fix JSON docs about loads() accepting only str objects, not bytes.Antoine Pitrou2011-01-211-0/+2
|
* #4785: document strict argument of JSONDecoder, plus add object_pairs_hook ↵Georg Brandl2010-10-151-4/+20
| | | | in the docstrings.
* #9087: update json docstrings -- unicode and long do not exist anymore.Georg Brandl2010-08-021-12/+10
|
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-021-88/+71
| | | | | | json also now works only with unicode strings Patch by Antoine Pitrou; updated by me
* Forward port r70471: Add object_pairs_hook. Issue 5381.Raymond Hettinger2009-04-211-5/+8
|
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-081-0/+318
svn+ssh://pythondev@svn.python.org/python/trunk ........ r62734 | brett.cannon | 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) | 5 lines Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob Ippolito. Closes issue #2750. ........ r62736 | georg.brandl | 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) | 2 lines Fix JSON module docs. ........ r62748 | benjamin.peterson | 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) | 2 lines PEP 8 nits in json package ........ r62769 | christian.heimes | 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) | 2 lines Intern static string Use float constructors instead of magic code for float constants ........