summaryrefslogtreecommitdiffstats
path: root/Lib/json
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | #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 ↵Georg Brandl2012-02-201-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | basic types (str, bytes, datetime) in order to make algorithmic complexity attacks on (e.g.) web apps much more complicated. The environment variable PYTHONHASHSEED and the new command line flag -R control this behavior.
| | * Issue #13703: add a way to randomize the hash values of basic types (str, ↵Georg Brandl2012-02-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | bytes, datetime) in order to make algorithmic complexity attacks on (e.g.) web apps much more complicated. The environment variable PYTHONHASHSEED and the new command line flag -R control this behavior.
| | * #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 ↵Ezio Melotti2011-05-101-1/+20
| | | | | | | | | | | | using the C accelerations.
| | * #12017: Fix segfault in json.loads() while decoding highly-nested objects ↵Ezio Melotti2011-05-071-0/+12
| | | | | | | | | | | | using the C accelerations.
* | | 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 ↵Ezio Melotti2011-04-132-0/+11
| | | | | | | | is not available.
| * 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
|\ \ | |/ | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
| * #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-132-1/+17
| | | | | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
| * Merged revisions 88137 via svnmerge fromAntoine Pitrou2011-01-211-0/+2
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88137 | antoine.pitrou | 2011-01-21 22:37:32 +0100 (ven., 21 janv. 2011) | 3 lines Fix JSON docs about loads() accepting only str objects, not bytes. ........
| * Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge fromGeorg Brandl2010-11-262-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://svn.python.org/python/branches/py3k ........ r85530 | georg.brandl | 2010-10-15 17:32:05 +0200 (Fr, 15 Okt 2010) | 1 line Refrain from using inline suites. ........ r85532 | georg.brandl | 2010-10-15 18:03:02 +0200 (Fr, 15 Okt 2010) | 1 line #7771: reference to documentation of dictview methods and operations. ........ r85533 | georg.brandl | 2010-10-15 18:07:41 +0200 (Fr, 15 Okt 2010) | 1 line #9683: remove broken dead code dealing with nested arguments removed from Py3k, and update the docs and docstrings accordingly. ........ r85534 | georg.brandl | 2010-10-15 18:19:43 +0200 (Fr, 15 Okt 2010) | 1 line #9801: document how list and dict proxies created by Managers behave w.r.t. mutable items. ........ r85538 | georg.brandl | 2010-10-15 18:35:46 +0200 (Fr, 15 Okt 2010) | 1 line #7303: add documentation for useful pkgutil functions and classes. ........ r85539 | georg.brandl | 2010-10-15 18:42:14 +0200 (Fr, 15 Okt 2010) | 1 line Fix issue references. ........ r85540 | georg.brandl | 2010-10-15 18:42:37 +0200 (Fr, 15 Okt 2010) | 1 line #6798: fix wrong docs for the arguments to several trace events. ........ r85541 | georg.brandl | 2010-10-15 18:53:24 +0200 (Fr, 15 Okt 2010) | 1 line #4968: updates to inspect.is* function docs. ........ r85542 | georg.brandl | 2010-10-15 19:01:15 +0200 (Fr, 15 Okt 2010) | 1 line #7790: move table of struct_time members to the actual description of struct_time. ........ r85543 | georg.brandl | 2010-10-15 19:03:02 +0200 (Fr, 15 Okt 2010) | 1 line #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings. ........ r85546 | georg.brandl | 2010-10-15 19:58:45 +0200 (Fr, 15 Okt 2010) | 1 line #5762: fix handling of empty namespace in minidom, which would result in AttributeError on toxml(). ........ r85547 | georg.brandl | 2010-10-15 20:00:35 +0200 (Fr, 15 Okt 2010) | 1 line #6098: Refrain from claiming DOM level 3 conformance in minidom. ........ r85548 | georg.brandl | 2010-10-15 21:46:19 +0200 (Fr, 15 Okt 2010) | 1 line #10072: assume a bit less knowledge of the FTP protocol in the ftplib docs. ........
generated by cgit v0.12 at 2026-01-10 08:14:44 (GMT)