summaryrefslogtreecommitdiff
path: root/Lib/json
Commit message (Expand)AuthorAgeFilesLines
* Merge #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-171-0/+1
|\
| * #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-171-0/+1
* | #17368: merge with 3.2.Ezio Melotti2013-03-131-2/+1
|\ \ | |/ |/|
| * Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-213-3/+3
| |\
| * \ #16476: merge with 3.2.Ezio Melotti2012-11-291-2/+1
| |\ \
| | * \ #16549: merge with 3.2.Ezio Melotti2012-11-291-9/+11
| | |\ \
| | * \ \ #16333: merge with 3.2.Ezio Melotti2012-11-292-5/+12
| | |\ \ \
| | * \ \ \ Merge issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
| | |\ \ \ \
| | * \ \ \ \ Issue #5067: improve some json error messages.Antoine Pitrou2012-06-293-7/+9
| | |\ \ \ \ \
| | * \ \ \ \ \ #14875: merge with 3.2.Ezio Melotti2012-05-211-2/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge 3.2: Issue #13703 plus some related test suite fixes.Georg Brandl2012-02-211-2/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Implement PEP 393.Martin v. Löwis2011-09-281-2/+1
* | | | | | | | | | #17368: Fix an off-by-one error in the Python JSON decoder that caused a fail...Ezio Melotti2013-03-131-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-213-3/+3
|/ / / / / / / /
* | | | | | | | #16476: Fix json.tool to avoid including trailing whitespace.Ezio Melotti2012-11-291-1/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | #16549: Make json.tool work again on Python 3 and add tests. Initial patch b...Ezio Melotti2012-11-291-9/+11
| |_|_|_|_|/ |/| | | | |
* | | | | | #16333: document a way to get rid of trailing whitespace when indent is used.Ezio Melotti2012-11-292-5/+12
| |_|_|_|/ |/| | | |
* | | | | Issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
| |_|_|/ |/| | |
* | | | Issue #5067: improve some json error messages.Antoine Pitrou2012-06-293-7/+9
| |_|/ |/| |
* | | #14875: Use float('inf') instead of float('1e66666') in the json module.Ezio Melotti2012-05-211-2/+1
|/ /
* | Merge from 3.1: Issue #13703: add a way to randomize the hash values of basic...Georg Brandl2012-02-2019-840/+22
|\ \ | |/
| * #5723: merge with 3.1.Ezio Melotti2011-05-141-2/+2
| * Merge 3.1Éric Araujo2011-04-2419-757/+22
| |\
| | * Merge with 3.1.Ezio Melotti2011-04-131-0/+6
| | |\
| | * \ Merge #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-121-1/+1
| | |\ \
| | * | | 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
* | | | | 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-111-1/+20
* | | | | #12017: Fix segfault in json.loads() while decoding highly-nested objects usi...Ezio Melotti2011-05-071-0/+12
|/ / / /
* | | | Add a space to make json doc a bit more readableÉric Araujo2011-04-211-1/+1
| |_|/ |/| |
* | | #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
| |/ |/|
* | #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-122-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