summaryrefslogtreecommitdiffstats
path: root/Lib/json
Commit message (Collapse)AuthorAgeFilesLines
* Fixed the documentation of parse_constant argument in json.load().Serhiy Storchaka2016-11-121-1/+1
|\ | | | | | | parse_constant doesn't get called on 'null', 'true', 'false' since 3.1/2.7.
| * Fixed the documentation of parse_constant argument in json.load().Serhiy Storchaka2016-11-121-1/+1
| | | | | | | | parse_constant doesn't get called on 'null', 'true', 'false' since 3.1/2.7.
* | Issue #28541: Improve test coverage for encoding detection in json library.Serhiy Storchaka2016-10-301-1/+2
| | | | | | | | Original patch by Eric Appelt.
* | Issue #17909: Accept binary input in json.loadsNick Coghlan2016-09-101-8/+42
| | | | | | | | | | | | | | json.loads (and hence json.load) now support binary input encoded as UTF-8, UTF-16 or UTF-32. Patch by Serhiy Storchaka.
* | Issue #4945: Improved the documenting of boolean arguments in the json module.Serhiy Storchaka2016-06-301-2/+2
|\ \ | |/ | | | | Based on patch by Gabriel Genellina.
| * Issue #4945: Improved the documenting of boolean arguments in the json module.Serhiy Storchaka2016-06-301-2/+2
| | | | | | | | Based on patch by Gabriel Genellina.
* | Issue #18726: All optional parameters of the dump(), dumps(),Serhiy Storchaka2016-06-213-6/+6
| | | | | | | | | | load() and loads() functions and JSONEncoder and JSONDecoder class constructors in the json module are now keyword-only.
* | Issue #26623: TypeError message for JSON unserializible object now containsSerhiy Storchaka2016-04-101-1/+2
|/ | | | | object's type name, not object's representation. Based on patch by Mahmoud Lababidi.
* Issue #26719: More efficient formatting of ints and floats in json.Serhiy Storchaka2016-04-101-10/+10
|
* Issue #24540: merger from 3.4Ned Deily2015-07-051-1/+1
|\
| * Issue #24540: fix typo in json.dumps docstringNed Deily2015-07-051-1/+1
| |
* | Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError.Serhiy Storchaka2015-01-262-48/+45
| |
* | Issue #23206: Make ``json.dumps(..., ensure_ascii=False)`` as fast as the ↵Antoine Pitrou2015-01-111-1/+8
| | | | | | | | default case of ``ensure_ascii=True``. Patch by Naoki Inada.
* | Issue #21650: Add an `--sort-keys` option to json.tool CLI.Berker Peksag2014-11-101-2/+10
| |
* | improve the command-line interface of json.tool (closes #21000)Benjamin Peterson2014-03-221-12/+15
|/ | | | A patch from Berker Peksag.
* Remove mentions of Python 2.x and being externally maintained fromGregory P. Smith2013-12-081-5/+2
|\ | | | | | | | | the bundled json module. Replace that with a mention of it being a version of the externally maintained simplejson module.
| * Remove mentions of Python 2.x and being externally maintained fromGregory P. Smith2013-12-081-5/+2
| | | | | | | | | | the bundled json module. Replace that with a mention of it being a version of the externally maintained simplejson module.
* | Issue #11489: JSON decoder now accepts lone surrogates.Serhiy Storchaka2013-11-261-18/+17
|\ \ | |/
| * Issue #11489: JSON decoder now accepts lone surrogates.Serhiy Storchaka2013-11-261-18/+17
| |
* | #18958: Improve error message for json.load(s) while passing a string that ↵Ezio Melotti2013-10-201-0/+2
| | | | | | | | starts with a UTF-8 BOM.
* | #19307: Improve error message for json.load(s) while passing objects of the ↵Ezio Melotti2013-10-201-0/+3
| | | | | | | | wrong type.
* | 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
| | | | | | | | ModuleNotFoundError.
* | Merge #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-181-0/+1
|\ \ | |/ | | | | Original patch by Kushal Das.
| * Merge #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-181-0/+1
| |\ | | | | | | | | | Original patch by Kushal Das.
| | * #16057: Clarify why the base method default is called in custom encoders.R David Murray2013-03-181-0/+1
| | | | | | | | | | | | Original patch by Kushal Das.
* | | #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 ↵Ezio Melotti2013-03-121-1/+1
| | | | | | | | | | | | failure while decoding empty object literals when object_pairs_hook was specified.
* | | Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-213-3/+3
|\ \ \ | |/ / | | | | | | with 1, as in other lines.
| * | Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-213-3/+3
| |\ \ | | |/ | | | | | | with 1, as in other lines.
| | * Issue #17225: JSON decoder now counts columns in the first line startingSerhiy Storchaka2013-02-213-3/+3
| | | | | | | | | | | | with 1, as in other lines.
| * | #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 ↵Ezio Melotti2013-01-032-9/+9
| | | | | | | | | | | | Storchaka.
* | | #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 ↵Ezio Melotti2012-11-291-9/+11
| | | | | | | | | | | | by Berker Peksag and Serhiy Storchaka.
| * | #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 ↵Victor Stinner2012-11-281-11/+3
| | | | | | | | | | | | Python 2.6
* | | #16333: fix example in docstring.Ezio Melotti2012-11-281-2/+1
| | |
* | | #16333: use (",", ": ") as default separator when indent is specified to ↵Ezio Melotti2012-11-282-9/+14
| | | | | | | | | | | | avoid trailing whitespace. Patch by Serhiy Storchaka.
* | | Merge issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
|\ \ \ | |/ / | | | | | | Patch by Chris Rebert.
| * | Merge issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
| |\ \ | | |/ | | | | | | Patch by Chris Rebert.
| | * Issue #14570: Document json sort_keys parameter properly.Andrew Svetlov2012-10-281-6/+12
| | | | | | | | | | | | Patch by Chris Rebert.
* | | more yield fromPhilip Jenvey2012-10-011-10/+5
|/ / | | | | | | patch by Serhiy Storchaka
* | Issue #5067: improve some json error messages.Antoine Pitrou2012-06-283-7/+9
|\ \ | |/ | | | | Patch by Serhiy Storchaka.
| * Issue #5067: improve some json error messages.Antoine Pitrou2012-06-283-7/+9
| | | | | | | | Patch by Serhiy Storchaka.