Ezio Melotti 401cf295e5 #16549: merge with 3.3.

2012-11-29 02:18:34 +02:00

..

__init__.py

#16333: fix example in docstring.

2012-11-29 00:45:22 +02:00

decoder.py

Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Python 2.6

2012-11-29 00:12:40 +01:00

encoder.py

#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

scanner.py

#9233: Fix json to work properly even when _json is not available.

2011-04-13 07:04:18 +03:00

tool.py

#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