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

..

tests

Merged revisions 86596 via svnmerge from

2010-11-21 01:30:29 +00:00

__init__.py

Merged revisions 88137 via svnmerge from

2011-01-21 21:39:56 +00:00

decoder.py

Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from

2010-11-26 08:42:45 +00:00

encoder.py

Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from

2010-10-06 08:26:09 +00:00

scanner.py

port simplejson upgrade from the trunk #4136

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

tool.py

port simplejson upgrade from the trunk #4136

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