| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge 3.1 | Éric Araujo | 2011-04-24 | 1 | -1/+1 |
| |\ |
|
| | * | Add a space to make json doc a bit more readable | Éric Araujo | 2011-04-21 | 1 | -1/+1 |
|
|
| * | | Merge with 3.1 | Georg Brandl | 2011-04-16 | 1 | -3/+4 |
| |\ \
| |/ |
|
| | * | Small wording fix. | Georg Brandl | 2011-04-16 | 1 | -3/+4 |
|
|
| * | | #4783: Merge with 3.1. | Ezio Melotti | 2011-04-15 | 1 | -0/+5 |
| |\ \
| |/ |
|
| | * | #4783: document that is not possible to use json.dump twice on the same stream. | Ezio Melotti | 2011-04-15 | 1 | -0/+5 |
|
|
| * | | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 1 | -4/+4 |
| |\ \
| |/ |
|
| | * | #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 1 | -3/+3 |
|
|
| | * | Merged revisions 88137 via svnmerge from | Antoine Pitrou | 2011-01-21 | 1 | -11/+6 |
|
|
| | * | Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from | Georg Brandl | 2010-11-26 | 1 | -3/+8 |
|
|
| | * | Merged revisions 84249,84264,84326-84327,84407,84476,84480-84482,84484,84530-... | Georg Brandl | 2010-10-06 | 1 | -6/+6 |
|
|
| | * | Merged revisions 81365,81367 via svnmerge from | Georg Brandl | 2010-05-19 | 1 | -1/+1 |
|
|
| | * | Merged revisions 74764 via svnmerge from | Ezio Melotti | 2009-09-13 | 1 | -4/+4 |
|
|
| * | | Merged revisions 88668 via svnmerge from | Benjamin Peterson | 2011-02-27 | 1 | -1/+1 |
|
|
| * | | Fix JSON docs about loads() accepting only str objects, not bytes. | Antoine Pitrou | 2011-01-21 | 1 | -11/+6 |
|
|
| * | | Issue #5729: json.dumps to support using '\t' as an indent string | Raymond Hettinger | 2010-10-31 | 1 | -4/+6 |
|
|
| * | | #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in... | Georg Brandl | 2010-10-15 | 1 | -3/+8 |
|
|
| * | | #9767: doctest run over json docs. | Georg Brandl | 2010-09-03 | 1 | -5/+5 |
|
|
| * | | #9649: fix default value description. | Georg Brandl | 2010-08-22 | 1 | -1/+1 |
|
|
| * | | Merged revisions 80030,80067,80069,80080-80081,80084,80432-80433,80465-80470,... | Georg Brandl | 2010-05-19 | 1 | -1/+1 |
|
|
| * | | fixed more examples that were using u"", print without () and unicode/str ins... | Ezio Melotti | 2009-09-13 | 1 | -4/+4 |
| |/ |
|
| * | Signature documentation style update, modules J, K, L and M. | Georg Brandl | 2009-06-08 | 1 | -7/+6 |
|
|
| * | Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,... | Benjamin Peterson | 2009-05-08 | 1 | -2/+2 |
|
|
| * | port simplejson upgrade from the trunk #4136 | Benjamin Peterson | 2009-05-02 | 1 | -43/+20 |
|
|
| * | Merged revisions 71814-71817,71901-71903 via svnmerge from | Georg Brandl | 2009-04-27 | 1 | -1/+1 |
|
|
| * | Fixed documentation build warning. | Hirokazu Yamamoto | 2009-04-26 | 1 | -2/+2 |
|
|
| * | Forward port r70471: Add object_pairs_hook. Issue 5381. | Raymond Hettinger | 2009-04-21 | 1 | -3/+25 |
|
|
| * | Remove mentions of "long". | Georg Brandl | 2009-04-11 | 1 | -4/+4 |
|
|
| * | Merged revisions 68162,68166,68171,68176,68195-68196,68210,68232 via svnmerge... | Georg Brandl | 2009-01-03 | 1 | -1/+1 |
|
|
| * | Remove trailing whitespace. | Georg Brandl | 2009-01-03 | 1 | -9/+9 |
|
|
| * | Merged revisions 68116-68119,68121,68123-68127 via svnmerge from | Benjamin Peterson | 2009-01-01 | 1 | -2/+2 |
|
|
| * | Devil merge! | Benjamin Peterson | 2008-09-28 | 1 | -2/+2 |
|
|
| * | Fix json examples so they would actually work in Py3k | Benjamin Peterson | 2008-05-15 | 1 | -8/+8 |
|
|
| * | Convert a lot of print statements to print functions in docstrings, | Neal Norwitz | 2008-05-13 | 1 | -5/+5 |
|
|
| * | Remove many "versionchanged" items that didn't use the official markup, | Georg Brandl | 2008-05-12 | 1 | -1/+0 |
|
|
| * | Merged revisions 62734,62736,62748,62769 via svnmerge from | Christian Heimes | 2008-05-08 | 1 | -0/+397 |
|
|
