mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 02:15:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
87,871 Commits 6 Branches 593 Tags 2.5 GiB
47efb4a5dc
Commit Graph

87 Commits

Author SHA1 Message Date
Serhiy Storchaka
47efb4a5dc Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError. 2015-01-26 13:16:30 +02:00
Antoine Pitrou
dc3eaa80d4 Issue #23206: Make `json.dumps(..., ensure_ascii=False) as fast as the default case of ensure_ascii=True`. Patch by Naoki Inada. 2015-01-11 16:41:01 +01:00
Berker Peksag
39e4c4d873 Issue #21650: Add an --sort-keys option to json.tool CLI. 2014-11-10 09:56:54 +02:00
Benjamin Peterson
940e207412 improve the command-line interface of json.tool (closes #21000) 
A patch from Berker Peksag.
 2014-03-21 23:17:29 -05:00
Gregory P. Smith
f491f92529 Remove mentions of Python 2.x and being externally maintained from 
the bundled json module.  Replace that with a mention of it being
a version of the externally maintained simplejson module.
 2013-12-08 00:39:36 -08:00
Gregory P. Smith
a82f74dee3 Remove mentions of Python 2.x and being externally maintained from 
the bundled json module.  Replace that with a mention of it being
a version of the externally maintained simplejson module.
 2013-12-08 00:39:07 -08:00
Serhiy Storchaka
687ff0ecdf Issue #11489: JSON decoder now accepts lone surrogates. 2013-11-26 21:27:11 +02:00
Serhiy Storchaka
c93329b3dd Issue #11489: JSON decoder now accepts lone surrogates. 2013-11-26 21:25:28 +02:00
Ezio Melotti
566a2be95c #18958: Improve error message for json.load(s) while passing a string that starts with a UTF-8 BOM. 2013-10-21 02:10:55 +03:00
Ezio Melotti
a0e768ccc2 #19307: Improve error message for json.load(s) while passing objects of the wrong type. 2013-10-21 01:52:33 +03:00
Ethan Furman
a4998a7041 Close #18264: int- and float-derived enums now converted to int or float. 2013-08-10 13:01:45 -07:00
Brett Cannon
cd171c8e92 Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a) 2013-07-04 17:43:24 -04:00
Brett Cannon
0a140668fa Issue #18200: Update the stdlib (except tests) to use 
ModuleNotFoundError.
 2013-06-13 20:57:26 -04:00
R David Murray
fbb1815491 Merge #16057: Clarify why the base method default is called in custom encoders. 
Original patch by Kushal Das.
 2013-03-17 21:53:48 -04:00
R David Murray
1f2a49cfc6 Merge #16057: Clarify why the base method default is called in custom encoders. 
Original patch by Kushal Das.
 2013-03-17 21:53:23 -04:00
R David Murray
dd246171e4 #16057: Clarify why the base method default is called in custom encoders. 
Original patch by Kushal Das.
 2013-03-17 21:52:35 -04:00
Ezio Melotti
405952f1a8 #17368: merge with 3.3. 2013-03-13 01:55:07 +02:00
Ezio Melotti
220391fa6e #17368: merge with 3.2. 2013-03-13 01:53:38 +02:00
Ezio Melotti
a7d64a6f4c #17368: Fix an off-by-one error in the Python JSON decoder that caused a failure while decoding empty object literals when object_pairs_hook was specified. 2013-03-13 01:52:34 +02:00
Serhiy Storchaka
920007ad76 Issue #17225: JSON decoder now counts columns in the first line starting 
with 1, as in other lines.
 2013-02-21 20:26:52 +02:00
Serhiy Storchaka
ed891c1517 Issue #17225: JSON decoder now counts columns in the first line starting 
with 1, as in other lines.
 2013-02-21 20:21:21 +02:00
Serhiy Storchaka
c510a048ba Issue #17225: JSON decoder now counts columns in the first line starting 
with 1, as in other lines.
 2013-02-21 20:19:16 +02:00
Ezio Melotti
37623ab5f1 #16009: JSON error messages now provide more information. Patch by Serhiy Storchaka. 2013-01-03 08:44:15 +02:00
Ezio Melotti
4cee810f5d #16476: merge with 3.2. 2012-11-29 02:26:15 +02:00
Ezio Melotti
b32512ed9a #16476: Fix json.tool to avoid including trailing whitespace. 2012-11-29 02:25:03 +02:00
Ezio Melotti
401cf295e5 #16549: merge with 3.3. 2012-11-29 02:18:34 +02:00
Ezio Melotti
1e86d01e1e #16549: merge with 3.2. 2012-11-29 02:16:58 +02:00
Ezio Melotti
057bcb4c6c #16549: Make json.tool work again on Python 3 and add tests. Initial patch by Berker Peksag and Serhiy Storchaka. 2012-11-29 02:15:18 +02:00
Victor Stinner
d7fed37059 Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Python 2.6 2012-11-29 00:12:40 +01:00
Ezio Melotti
9f94b6dc4b #16333: fix example in docstring. 2012-11-29 00:45:22 +02:00
Ezio Melotti
100314427a #16333: use (",", ": ") as default separator when indent is specified to avoid trailing whitespace. Patch by Serhiy Storchaka. 2012-11-29 00:42:56 +02:00
Ezio Melotti
57af3bf158 #16333: merge with 3.2. 2012-11-29 00:36:42 +02:00
Ezio Melotti
d654dedbbb #16333: document a way to get rid of trailing whitespace when indent is used. 2012-11-29 00:35:29 +02:00
Andrew Svetlov
42b8932c12 Merge issue #14570: Document json sort_keys parameter properly. 
Patch by Chris Rebert.
 2012-10-28 14:11:21 +02:00
Andrew Svetlov
6d50a5447a Merge issue #14570: Document json sort_keys parameter properly. 
Patch by Chris Rebert.
 2012-10-28 14:11:00 +02:00
Andrew Svetlov
2ec53be2e2 Issue #14570: Document json sort_keys parameter properly. 
Patch by Chris Rebert.
 2012-10-28 14:10:30 +02:00
Philip Jenvey
fd0d3e5d25 more yield from 
patch by Serhiy Storchaka
 2012-10-01 15:34:31 -07:00
Antoine Pitrou
802d669044 Issue #5067: improve some json error messages. 
Patch by Serhiy Storchaka.
 2012-06-29 01:59:54 +02:00
Antoine Pitrou
2d24e94bbe Issue #5067: improve some json error messages. 
Patch by Serhiy Storchaka.
 2012-06-29 01:58:26 +02:00
Ezio Melotti
4226543490 #14875: merge with 3.2. 2012-05-21 17:53:42 -06:00
Ezio Melotti
898d51da4d #14875: Use float('inf') instead of float('1e66666') in the json module. 2012-05-21 17:49:06 -06:00
Georg Brandl
2fb477c0f0 Merge 3.2: Issue #13703 plus some related test suite fixes. 2012-02-21 00:33:36 +01:00
Georg Brandl
09a7c72cad Merge from 3.1: Issue #13703: add a way to randomize the hash values of 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.
 2012-02-20 21:31:46 +01:00
Georg Brandl
2daf6ae249 Issue #13703: add a way to randomize the hash values of 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.
 2012-02-20 19:54:16 +01:00
Martin v. Löwis
d63a3b8beb Implement PEP 393. 2011-09-28 07:41:54 +02:00
Ezio Melotti
6b60fb9148 #5723: merge with 3.1. 2011-05-14 06:47:51 +03:00
Ezio Melotti
3c0d8a1cc7 #5723: Improve json tests to be executed with and without accelerations. 2011-05-14 06:38:03 +03:00
Ezio Melotti
136726537f #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. 2011-05-11 01:02:56 +03:00
Ezio Melotti
362b95102f #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. 2011-05-07 17:58:09 +03:00
Éric Araujo
fbeb1a9468 Merge 3.1 2011-04-24 02:42:52 +02:00