Ezio Melotti 6b60fb9148 #5723: merge with 3.1.

2011-05-14 06:47:51 +03:00

..

__init__.py

Add a space to make json doc a bit more readable

2011-04-21 02:37:41 +02:00

decoder.py

#5723: merge with 3.1.

2011-05-14 06:47:51 +03:00

encoder.py

Merge #10019: Fix regression relative to 2.6: add newlines if indent=0

2011-04-12 21:09:18 -04: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

port simplejson upgrade from the trunk #4136

2009-05-02 12:36:44 +00:00