summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-01-21 21:39:56 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-01-21 21:39:56 (GMT)
commita970e6225885292974d266112cc39f350fdf979e (patch)
tree6cc8f655e9d9b949f5de9cda69094573fd741383 /Lib/logging
parent6107a4e24a0347df6c1e337a23bdcc735539a0cf (diff)
downloadcpython-a970e6225885292974d266112cc39f350fdf979e.zip
cpython-a970e6225885292974d266112cc39f350fdf979e.tar.gz
cpython-a970e6225885292974d266112cc39f350fdf979e.tar.bz2
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. ........
Diffstat (limited to 'Lib/logging')
0 files changed, 0 insertions, 0 deletions