Blocked revisions 73774,73812,73839 via svnmerge

........
  r73774 | benjamin.peterson | 2009-07-02 13:06:17 -0400 (Thu, 02 Jul 2009) | 1 line

  only order comparisons are removed in py3k #6119
........
  r73812 | benjamin.peterson | 2009-07-03 10:08:20 -0400 (Fri, 03 Jul 2009) | 1 line

  another cStringIO restriction
........
  r73839 | gregory.p.smith | 2009-07-04 04:42:10 -0400 (Sat, 04 Jul 2009) | 3 lines

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