summaryrefslogtreecommitdiffstats
path: root/Lib/json
Commit message (Expand)AuthorAgeFilesLines
* #18958: Improve error message for json.load(s) while passing a string that st...Ezio Melotti2013-10-201-0/+2
* #19307: Improve error message for json.load(s) while passing objects of the w...Ezio Melotti2013-10-201-0/+3
* Close #18264: int- and float-derived enums now converted to int or float.Ethan Furman2013-08-101-8/+19
* Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a)Brett Cannon2013-07-043-4/+4
* Issue #18200: Update the stdlib (except tests) to useBrett Cannon2013-06-143-4/+4
* Merge #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-181-0/+1
|\
| * Merge #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-181-0/+1
| |\
| | * #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-181-0/+1
* | | #17368: merge with 3.3.Ezio Melotti2013-03-121-1/+1
|\ \ \ | |/ /
| * | #17368: merge with 3.2.Ezio Melotti2013-03-121-1/+1
| |\ \ | | |/
| | * #17368: Fix an off-by-one error in the Python JSON decoder that caused a fail...Ezio Melotti2013-03-121-1/+1
* | | Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-213-3/+3
|\ \ \ | |/ /
| * | Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-213-3/+3
| |\ \ | | |/
| | * 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-1/+2
| |\ \ | | |/
| | * #16476: Fix json.tool to avoid including trailing whitespace.Ezio Melotti2012-11-291-1/+2
* | | #16009: JSON error messages now provide more information. Patch by Serhiy St...Ezio Melotti2013-01-032-9/+9
* | | #16549: merge with 3.3.Ezio Melotti2012-11-291-9/+11
|\ \ \ | |/ /
| * | #16549: merge with 3.2.Ezio Melotti2012-11-291-9/+11
| |\ \ | | |/
| | * #16549: Make json.tool work again on Python 3 and add tests. Initial patch b...Ezio Melotti2012-11-291-9/+11
| * | #16333: merge with 3.2.Ezio Melotti2012-11-282-5/+12
| |\ \ | | |/
| | * #16333: document a way to get rid of trailing whitespace when indent is used.Ezio Melotti2012-11-282-5/+12
* | | Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Py...Victor Stinner2012-11-281-11/+3
* | | #16333: fix example in docstring.Ezio Melotti2012-11-281-2/+1
* | | #16333: use (",", ": ") as default separator when indent is specified to avoi...Ezio Melotti2012-11-282-9/+14
* | | Merge issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
|\ \ \ | |/ /
| * | Merge issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
| |\ \ | | |/
| | * Issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
* | | more yield fromPhilip Jenvey2012-10-011-10/+5
|/ /
* | Issue #5067: improve some json error messages.Antoine Pitrou2012-06-283-7/+9
|\ \ | |/
| * Issue #5067: improve some json error messages.Antoine Pitrou2012-06-283-7/+9
* | #14875: merge with 3.2.Ezio Melotti2012-05-211-2/+1
|\ \ | |/
| * #14875: Use float('inf') instead of float('1e66666') in the json module.Ezio Melotti2012-05-211-2/+1
* | Merge 3.2: Issue #13703 plus some related test suite fixes.Georg Brandl2012-02-201-1/+3
|\ \ | |/
| * 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
* | | Implement PEP 393.Martin v. Löwis2011-09-281-2/+1
|/ /
* | #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
generated by cgit v0.12 at 2024-11-16 20:42:53 (GMT)