| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | #5723: merge with 3.1. | Ezio Melotti | 2011-05-14 | 1 | -2/+2 |
|
|
| * | 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. | Ezio Melotti | 2011-04-13 | 1 | -0/+6 |
| |\ \
| |/ |
|
| | * | #9233: Fix json.loads({}) to return a dict (instead of a list), when _json is... | Ezio Melotti | 2011-04-13 | 2 | -0/+11 |
|
|
| | * | Remove unnecessary imports and use assertIs instead of assertTrue. | Ezio Melotti | 2011-04-13 | 2 | -5/+3 |
|
|
| | * | #9233: Fix json to work properly even when _json is not available. | Ezio Melotti | 2011-04-13 | 2 | -1/+2 |
|
|
| | * | #9233: skip _json-specific tests when _json is not available. | Ezio Melotti | 2011-04-13 | 2 | -2/+14 |
|
|
| * | | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 2 | -1/+17 |
|
|
| | * | Merged revisions 88137 via svnmerge from | Antoine Pitrou | 2011-01-21 | 1 | -0/+2 |
|
|
| | * | Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from | Georg Brandl | 2010-11-26 | 2 | -4/+34 |
|
|
| | * | Merged revisions 86596 via svnmerge from | Ezio Melotti | 2010-11-21 | 14 | -59/+59 |
|
|
| | * | Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-... | Georg Brandl | 2010-10-06 | 3 | -23/+21 |
|
|
| | * | Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,... | Florent Xicluna | 2010-08-14 | 1 | -1/+1 |
|
|
| | * | Merged revisions 83016 via svnmerge from | Doug Hellmann | 2010-07-21 | 1 | -0/+9 |
|
|
| | * | Merged revisions 76710 via svnmerge from | Antoine Pitrou | 2009-12-08 | 1 | -2/+11 |
|
|
| | * | Merged revisions 73715 via svnmerge from | Georg Brandl | 2009-08-13 | 2 | -4/+4 |
|
|
| * | | Fix JSON docs about loads() accepting only str objects, not bytes. | Antoine Pitrou | 2011-01-21 | 1 | -0/+2 |
|
|
| * | | Issue #10572: Moved json tests to Lib/test/json_tests. | Alexander Belopolsky | 2010-11-30 | 16 | -751/+0 |
|
|
| * | | Remove unnecessary import. | Barry Warsaw | 2010-11-24 | 1 | -1/+0 |
|
|
| * | | #9424: Replace deprecated assert* methods in the Python test suite. | Ezio Melotti | 2010-11-20 | 14 | -61/+61 |
|
|
| * | | Issue #5729: json.dumps to support using '\t' as an indent string | Raymond Hettinger | 2010-10-31 | 2 | -22/+29 |
|
|
| * | | #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in... | Georg Brandl | 2010-10-15 | 2 | -4/+34 |
|
|
| * | | Issue #7451: Improve decoding performance of JSON objects, and reduce | Antoine Pitrou | 2010-09-04 | 3 | -3/+45 |
|
|
| * | | #9087: update json docstrings -- unicode and long do not exist anymore. | Georg Brandl | 2010-08-02 | 3 | -23/+21 |
|
|
| * | | Syntax cleanup. | Florent Xicluna | 2010-07-28 | 1 | -1/+1 |
|
|
| * | | Apply patch from Ray Allen for issue 9296 | Doug Hellmann | 2010-07-21 | 1 | -0/+9 |
|
|
| * | | Merged revisions 76708 via svnmerge from | Antoine Pitrou | 2009-12-08 | 1 | -2/+11 |
|
|
| * | | convert old fail* assertions to assert* | Benjamin Peterson | 2009-06-30 | 2 | -4/+4 |
| |/ |
|
| * | * Fix-up a TODO (support the sort_key option). | Raymond Hettinger | 2009-05-27 | 2 | -1/+6 |
|
|
| * | Issue 6105: json encoder to respect iteration order of its inputs. | Raymond Hettinger | 2009-05-27 | 1 | -0/+8 |
|
|
| * | Merged revisions 72314 via svnmerge from | Georg Brandl | 2009-05-05 | 1 | -0/+3 |
|
|
| * | port simplejson upgrade from the trunk #4136 | Benjamin Peterson | 2009-05-02 | 12 | -529/+555 |
|
|
| * | Forward port r70471: Add object_pairs_hook. Issue 5381. | Raymond Hettinger | 2009-04-21 | 4 | -8/+54 |
|
|
| * | merge r66932 and add a few py3k only checks | Benjamin Peterson | 2008-10-16 | 2 | -2/+13 |
|
|
| * | #2834: Change re module semantics, so that str and bytes mixing is forbidden, | Antoine Pitrou | 2008-08-19 | 1 | -1/+1 |
|
|
| * | Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge... | Christian Heimes | 2008-05-08 | 1 | -7/+7 |
|
|
| * | Merged revisions 62734,62736,62748,62769 via svnmerge from | Christian Heimes | 2008-05-08 | 21 | -0/+1774 |
|
|
