Blocked revisions 62985-62986 via svnmerge

........
  r62985 | brett.cannon | 2008-05-09 20:14:32 -0700 (Fri, 09 May 2008) | 2 lines

  The Canvas module has been deprecated for removal in 3.0.
........
  r62986 | brett.cannon | 2008-05-09 20:16:38 -0700 (Fri, 09 May 2008) | 3 lines

  Make sure warnings are not suppressed when testing for the raised
  DeprecationWarning.
........