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
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
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
b32512ed9a
#16476 : Fix json.tool to avoid including trailing whitespace.
2012-11-29 02:25:03 +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
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
2ec53be2e2
Issue #14570 : Document json sort_keys parameter properly.
...
Patch by Chris Rebert.
2012-10-28 14:10:30 +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
898d51da4d
#14875 : Use float('inf') instead of float('1e66666') in the json module.
2012-05-21 17:49:06 -06: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
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
Éric Araujo
de579d4359
Add a space to make json doc a bit more readable
2011-04-21 02:37:41 +02:00
Ezio Melotti
04c6423fba
Merge with 3.1.
2011-04-13 07:18:24 +03:00
Ezio Melotti
d210aa1ad9
#9233 : Fix json.loads({}) to return a dict (instead of a list), when _json is not available.
2011-04-13 07:10:13 +03:00
Ezio Melotti
42368f9b0c
Remove unnecessary imports and use assertIs instead of assertTrue.
2011-04-13 07:08:17 +03:00
Ezio Melotti
c753305180
#9233 : Fix json to work properly even when _json is not available.
2011-04-13 07:04:18 +03:00
Ezio Melotti
4f95a52fe2
#9233 : skip _json-specific tests when _json is not available.
2011-04-13 06:58:29 +03:00
R David Murray
d5315482e9
Merge #10019 : Fix regression relative to 2.6: add newlines if indent=0
...
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
2011-04-12 21:09:18 -04:00
R David Murray
3dd02d62c9
#10019 : Fix regression relative to 2.6: add newlines if indent=0
...
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
2011-04-12 21:02:45 -04:00
Antoine Pitrou
a970e62258
Merged revisions 88137 via svnmerge from
...
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.
........
2011-01-21 21:39:56 +00:00
