| Commit message (Expand) | Author | Age | Files | Lines |
* | #12051: merge with 3.1. | Ezio Melotti | 2011-05-10 | 1 | -2/+15 |
|\ |
|
| * | #12051: Fix segfault in json.dumps() while encoding highly-nested objects usi... | Ezio Melotti | 2011-05-10 | 1 | -2/+15 |
|
|
* | | #12017: merge with 3.1. | Ezio Melotti | 2011-05-07 | 1 | -2/+13 |
|\ \
| |/ |
|
| * | #12017: Fix segfault in json.loads() while decoding highly-nested objects usi... | Ezio Melotti | 2011-05-07 | 1 | -2/+13 |
|
|
| * | Merged revisions 85342 via svnmerge from | Antoine Pitrou | 2010-10-09 | 1 | -1/+1 |
|
|
| * | Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-... | Georg Brandl | 2010-10-06 | 1 | -3/+3 |
|
|
| * | Merged revisions 83016 via svnmerge from | Doug Hellmann | 2010-07-21 | 1 | -1/+1 |
|
|
| * | Recorded merge of revisions 81032 via svnmerge from | Antoine Pitrou | 2010-05-09 | 1 | -18/+18 |
|
|
| * | Merged revisions 76710 via svnmerge from | Antoine Pitrou | 2009-12-08 | 1 | -4/+15 |
|
|
* | | Issue #10314: improve performance of JSON encoding with sort_keys=True | Antoine Pitrou | 2010-11-04 | 1 | -20/+25 |
|
|
* | | Issue #10055: Make json C89-compliant in UCS4 mode. | Antoine Pitrou | 2010-10-09 | 1 | -1/+1 |
|
|
* | | Issue #7451: Improve decoding performance of JSON objects, and reduce | Antoine Pitrou | 2010-09-04 | 1 | -45/+82 |
|
|
* | | #9087: update json docstrings -- unicode and long do not exist anymore. | Georg Brandl | 2010-08-02 | 1 | -3/+3 |
|
|
* | | Apply patch from Ray Allen for issue 9296 | Doug Hellmann | 2010-07-21 | 1 | -1/+1 |
|
|
* | | Recorded merge of revisions 81029 via svnmerge from | Antoine Pitrou | 2010-05-09 | 1 | -18/+18 |
|
|
* | | Merged revisions 76708 via svnmerge from | Antoine Pitrou | 2009-12-08 | 1 | -4/+15 |
|/ |
|
* | Fix TODO: do the sort by just the key, not the key/value pair. | Raymond Hettinger | 2009-05-27 | 1 | -15/+20 |
|
|
* | * Fix-up a TODO (support the sort_key option). | Raymond Hettinger | 2009-05-27 | 1 | -20/+40 |
|
|
* | Issue 6105: json encoder to respect iteration order of its inputs. | Raymond Hettinger | 2009-05-27 | 1 | -5/+22 |
|
|
* | Merged revisions 72314 via svnmerge from | Georg Brandl | 2009-05-05 | 1 | -3/+3 |
|
|
* | Fixed warning. (Should not use *const* as variable name) | Hirokazu Yamamoto | 2009-05-02 | 1 | -1/+1 |
|
|
* | port simplejson upgrade from the trunk #4136 | Benjamin Peterson | 2009-05-02 | 1 | -330/+1377 |
|
|
* | Merged revisions 66938,66942 via svnmerge from | Benjamin Peterson | 2008-10-16 | 1 | -4/+6 |
|
|
* | merge r66932 and add a few py3k only checks | Benjamin Peterson | 2008-10-16 | 1 | -4/+6 |
|
|
* | #3560: cleanup C memoryview API | Antoine Pitrou | 2008-08-19 | 1 | -1/+1 |
|
|
* | Merged revisions 65654 via svnmerge from | Martin v. Löwis | 2008-08-13 | 1 | -1/+1 |
|
|
* | Merged revisions 65147 via svnmerge from | Benjamin Peterson | 2008-07-19 | 1 | -2/+10 |
|
|
* | Implement PEP 3121: new module initialization and finalization API. | Martin v. Löwis | 2008-06-11 | 1 | -4/+15 |
|
|
* | Renamed PyString to PyBytes | Christian Heimes | 2008-05-26 | 1 | -18/+18 |
|
|
* | Move variable declaration to the top of the block, | Amaury Forgeot d'Arc | 2008-05-08 | 1 | -1/+2 |
|
|
* | Merged revisions 62734,62736,62748,62769 via svnmerge from | Christian Heimes | 2008-05-08 | 1 | -0/+620 |
|
|