]> granicus.if.org Git - python/commit
Merged revisions 88137 via svnmerge from
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 21 Jan 2011 21:39:56 +0000 (21:39 +0000)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 21 Jan 2011 21:39:56 +0000 (21:39 +0000)
commita970e6225885292974d266112cc39f350fdf979e
tree6cc8f655e9d9b949f5de9cda69094573fd741383
parent6107a4e24a0347df6c1e337a23bdcc735539a0cf
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.
........
Doc/library/json.rst
Lib/json/__init__.py