summaryrefslogtreecommitdiffstats
path: root/Lib/json/__init__.py
Commit message (Expand)AuthorAgeFilesLines
* Remove mentions of Python 2.x and being externally maintained fromGregory P. Smith2013-12-081-5/+2
|\
| * Remove mentions of Python 2.x and being externally maintained fromGregory P. Smith2013-12-081-5/+2
* | #18958: Improve error message for json.load(s) while passing a string that st...Ezio Melotti2013-10-201-0/+2
* | #19307: Improve error message for json.load(s) while passing objects of the w...Ezio Melotti2013-10-201-0/+3
* | Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-211-1/+1
|\ \ | |/
| * Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-211-1/+1
| * #16333: document a way to get rid of trailing whitespace when indent is used.Ezio Melotti2012-11-281-4/+8
* | #16333: fix example in docstring.Ezio Melotti2012-11-281-2/+1
* | #16333: use (",", ": ") as default separator when indent is specified to avoi...Ezio Melotti2012-11-281-6/+8
|/
* Issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
* Issue #5067: improve some json error messages.Antoine Pitrou2012-06-281-1/+1
* Issue #13703: add a way to randomize the hash values of basic types (str, byt...Georg Brandl2012-02-201-1/+3
* Add a space to make json doc a bit more readableÉric Araujo2011-04-211-1/+1
* Merged revisions 88137 via svnmerge fromAntoine Pitrou2011-01-211-0/+2
* Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge fromGeorg Brandl2010-11-261-4/+20
* Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-...Georg Brandl2010-10-061-12/+10
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-021-88/+71
* 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