Merged from trunk 6221:6229

Merged from trunk 6221:6229

Fix a typo.

Fix broken exception handling.

Fix a broken test.

ignore *.py[co] (SpankMan)

Use mkstemp to create a random tempfile.

fix for older python who have oddly named __exc_info() (WarnerBro)

bump ________foo from the TestCase class since _exc_info() doesn't do
anything anyway (WarnerBro)

send stdout to /dev/null since we rely on the output of stdout here to
determine the proper suffix #171212 (SpankMan)

svn path=/main/branches/prefix/; revision=6237