summaryrefslogtreecommitdiffstats
path: root/Lib/json
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-11-10 14:01:16 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-11-10 14:01:16 (GMT)
commitcb4f9298123f1cfbbe1bdeddfbbadd2aa448140b (patch)
tree8a6afeea1631cc310056f183984f0298c0dc3db2 /Lib/json
parent0a69b856d56860e2dce0ae58e65de57c58a95763 (diff)
downloadcpython-cb4f9298123f1cfbbe1bdeddfbbadd2aa448140b.zip
cpython-cb4f9298123f1cfbbe1bdeddfbbadd2aa448140b.tar.gz
cpython-cb4f9298123f1cfbbe1bdeddfbbadd2aa448140b.tar.bz2
I'm only backporting the tests (which run fine), as well as
a shortened version of Lib/test/script_helper.py. Merged revisions 86395 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86395 | antoine.pitrou | 2010-11-10 14:55:25 +0100 (mer., 10 nov. 2010) | 4 lines Issue #10372: Import the warnings module only after the IO library is initialized, so as to avoid bootstrap issues with the '-W' option. ........
Diffstat (limited to 'Lib/json')
0 files changed, 0 insertions, 0 deletions