| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | #5723: merge with 3.1. | Ezio Melotti | 2011-05-14 | 1 | -2/+2 |
|
|
| * | 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 | 1 | -0/+6 |
|
|
| | * | #9233: Fix json to work properly even when _json is not available. | Ezio Melotti | 2011-04-13 | 1 | -1/+1 |
|
|
| | * | Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from | Georg Brandl | 2010-11-26 | 1 | -0/+14 |
|
|
| | * | Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-... | Georg Brandl | 2010-10-06 | 1 | -6/+6 |
|
|
| * | | #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in... | Georg Brandl | 2010-10-15 | 1 | -0/+14 |
|
|
| * | | Issue #7451: Improve decoding performance of JSON objects, and reduce | Antoine Pitrou | 2010-09-04 | 1 | -2/+8 |
|
|
| * | | #9087: update json docstrings -- unicode and long do not exist anymore. | Georg Brandl | 2010-08-02 | 1 | -6/+6 |
| |/ |
|
| * | port simplejson upgrade from the trunk #4136 | Benjamin Peterson | 2009-05-02 | 1 | -139/+132 |
|
|
| * | Forward port r70471: Add object_pairs_hook. Issue 5381. | Raymond Hettinger | 2009-04-21 | 1 | -3/+11 |
|
|
| * | merge r66932 and add a few py3k only checks | Benjamin Peterson | 2008-10-16 | 1 | -2/+6 |
|
|
| * | #2834: Change re module semantics, so that str and bytes mixing is forbidden, | Antoine Pitrou | 2008-08-19 | 1 | -1/+1 |
|
|
| * | Merged revisions 62734,62736,62748,62769 via svnmerge from | Christian Heimes | 2008-05-08 | 1 | -0/+339 |
|
|
