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
c93329b3dd
Issue #11489 : JSON decoder now accepts lone surrogates.
2013-11-26 21:25:28 +02: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
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
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
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
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
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
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
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
