Blocked revisions 66197 via svnmerge

........
  r66197 | brett.cannon | 2008-09-03 15:45:11 -0700 (Wed, 03 Sep 2008) | 6 lines

  test_py3kwarn had been overlooked when test.test_support.catch_warning() was
  re-implemented to use warnings.catch_warnings() and had its API improved.

  Closes issue #3768.
  Code review by Benjamin Peterson.
........