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
