summaryrefslogtreecommitdiffstats
path: root/Doc/library/json.rst
Commit message (Expand)AuthorAgeFilesLines
* Fix highlight and spacing in json example.Ezio Melotti2012-04-141-4/+4
* 3.2 explain json.dumps for non-string keys in dicts. closes issue6566. Patch ...Senthil Kumaran2012-03-171-0/+8
* Document json.dump ensure_ascii parameter (#13770)Éric Araujo2012-01-161-0/+4
* Merge 3.1Éric Araujo2011-04-241-1/+1
|\
| * Add a space to make json doc a bit more readableÉric Araujo2011-04-211-1/+1
* | Merge with 3.1Georg Brandl2011-04-161-3/+4
|\ \ | |/
| * Small wording fix.Georg Brandl2011-04-161-3/+4
* | #4783: Merge with 3.1.Ezio Melotti2011-04-151-0/+5
|\ \ | |/
| * #4783: document that is not possible to use json.dump twice on the same stream.Ezio Melotti2011-04-151-0/+5
* | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-131-4/+4
|\ \ | |/
| * #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-131-3/+3
| * Merged revisions 88137 via svnmerge fromAntoine Pitrou2011-01-211-11/+6
| * Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge fromGeorg Brandl2010-11-261-3/+8
| * Merged revisions 84249,84264,84326-84327,84407,84476,84480-84482,84484,84530-...Georg Brandl2010-10-061-6/+6
| * Merged revisions 81365,81367 via svnmerge fromGeorg Brandl2010-05-191-1/+1
| * Merged revisions 74764 via svnmerge fromEzio Melotti2009-09-131-4/+4
* | Merged revisions 88668 via svnmerge fromBenjamin Peterson2011-02-271-1/+1
* | Fix JSON docs about loads() accepting only str objects, not bytes.Antoine Pitrou2011-01-211-11/+6
* | Issue #5729: json.dumps to support using '\t' as an indent stringRaymond Hettinger2010-10-311-4/+6
* | #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in...Georg Brandl2010-10-151-3/+8
* | #9767: doctest run over json docs.Georg Brandl2010-09-031-5/+5
* | #9649: fix default value description.Georg Brandl2010-08-221-1/+1
* | Merged revisions 80030,80067,80069,80080-80081,80084,80432-80433,80465-80470,...Georg Brandl2010-05-191-1/+1
* | fixed more examples that were using u"", print without () and unicode/str ins...Ezio Melotti2009-09-131-4/+4
|/
* Signature documentation style update, modules J, K, L and M.Georg Brandl2009-06-081-7/+6
* Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,...Benjamin Peterson2009-05-081-2/+2
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-021-43/+20
* Merged revisions 71814-71817,71901-71903 via svnmerge fromGeorg Brandl2009-04-271-1/+1
* Fixed documentation build warning.Hirokazu Yamamoto2009-04-261-2/+2
* Forward port r70471: Add object_pairs_hook. Issue 5381.Raymond Hettinger2009-04-211-3/+25
* Remove mentions of "long".Georg Brandl2009-04-111-4/+4
* Merged revisions 68162,68166,68171,68176,68195-68196,68210,68232 via svnmerge...Georg Brandl2009-01-031-1/+1
* Remove trailing whitespace.Georg Brandl2009-01-031-9/+9
* Merged revisions 68116-68119,68121,68123-68127 via svnmerge fromBenjamin Peterson2009-01-011-2/+2
* Devil merge!Benjamin Peterson2008-09-281-2/+2
* Fix json examples so they would actually work in Py3kBenjamin Peterson2008-05-151-8/+8
* Convert a lot of print statements to print functions in docstrings,Neal Norwitz2008-05-131-5/+5
* Remove many "versionchanged" items that didn't use the official markup,Georg Brandl2008-05-121-1/+0
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-081-0/+397