summaryrefslogtreecommitdiffstats
path: root/Lib/json
Commit message (Expand)AuthorAgeFilesLines
* Merge from 3.1: Issue #13703: add a way to randomize the hash values of basic...Georg Brandl2012-02-201-1/+3
|\
| * Issue #13703: add a way to randomize the hash values of basic types (str, byt...Georg Brandl2012-02-201-1/+3
| * #5723: Improve json tests to be executed with and without accelerations.Ezio Melotti2011-05-1417-193/+245
| * #12051: Fix segfault in json.dumps() while encoding highly-nested objects usi...Ezio Melotti2011-05-101-1/+20
| * #12017: Fix segfault in json.loads() while decoding highly-nested objects usi...Ezio Melotti2011-05-071-0/+12
* | #5723: merge with 3.1.Ezio Melotti2011-05-141-2/+2
* | 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.1.Ezio Melotti2011-04-131-0/+6
|\ \ | |/
| * #9233: Fix json.loads({}) to return a dict (instead of a list), when _json is...Ezio Melotti2011-04-132-0/+11
| * Remove unnecessary imports and use assertIs instead of assertTrue.Ezio Melotti2011-04-132-5/+3
| * #9233: Fix json to work properly even when _json is not available.Ezio Melotti2011-04-132-1/+2
| * #9233: skip _json-specific tests when _json is not available.Ezio Melotti2011-04-132-2/+14
* | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-131-1/+1
|\ \ | |/
| * #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-132-1/+17
| * Merged revisions 88137 via svnmerge fromAntoine Pitrou2011-01-211-0/+2
| * Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge fromGeorg Brandl2010-11-262-4/+34
| * Merged revisions 86596 via svnmerge fromEzio Melotti2010-11-2114-59/+59
| * Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-...Georg Brandl2010-10-063-23/+21
| * Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,...Florent Xicluna2010-08-141-1/+1
| * Merged revisions 83016 via svnmerge fromDoug Hellmann2010-07-211-0/+9
| * Merged revisions 76710 via svnmerge fromAntoine Pitrou2009-12-081-2/+11
| * Merged revisions 73715 via svnmerge fromGeorg Brandl2009-08-132-4/+4
* | Fix JSON docs about loads() accepting only str objects, not bytes.Antoine Pitrou2011-01-211-0/+2
* | Issue #10572: Moved json tests to Lib/test/json_tests.Alexander Belopolsky2010-11-3016-751/+0
* | Remove unnecessary import.Barry Warsaw2010-11-241-1/+0
* | #9424: Replace deprecated assert* methods in the Python test suite.Ezio Melotti2010-11-2014-61/+61
* | Issue #5729: json.dumps to support using '\t' as an indent stringRaymond Hettinger2010-10-312-22/+29
* | #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in...Georg Brandl2010-10-152-4/+34
* | Issue #7451: Improve decoding performance of JSON objects, and reduceAntoine Pitrou2010-09-043-3/+45
* | #9087: update json docstrings -- unicode and long do not exist anymore.Georg Brandl2010-08-023-23/+21
* | Syntax cleanup.Florent Xicluna2010-07-281-1/+1
* | Apply patch from Ray Allen for issue 9296Doug Hellmann2010-07-211-0/+9
* | Merged revisions 76708 via svnmerge fromAntoine Pitrou2009-12-081-2/+11
* | convert old fail* assertions to assert*Benjamin Peterson2009-06-302-4/+4
|/
* * Fix-up a TODO (support the sort_key option).Raymond Hettinger2009-05-272-1/+6
* Issue 6105: json encoder to respect iteration order of its inputs.Raymond Hettinger2009-05-271-0/+8
* Merged revisions 72314 via svnmerge fromGeorg Brandl2009-05-051-0/+3
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-0212-529/+555
* Forward port r70471: Add object_pairs_hook. Issue 5381.Raymond Hettinger2009-04-214-8/+54
* merge r66932 and add a few py3k only checksBenjamin Peterson2008-10-162-2/+13
* #2834: Change re module semantics, so that str and bytes mixing is forbidden,Antoine Pitrou2008-08-191-1/+1
* Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge...Christian Heimes2008-05-081-7/+7
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-0821-0/+1774