84 Commits

Author SHA1 Message Date
Ned Deily
54630d999f Issue #24540: fix typo in json.dumps docstring 2015-07-05 11:45:01 -07: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