Merge r73838 from py3k branch.  Use the nondeprecated unittest method
names.
8 files changed