Merged revisions 78758 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78758 | florent.xicluna | 2010-03-07 14:18:33 +0200 (Sun, 07 Mar 2010) | 4 lines

  Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are
  effectively raised.  A new utility ``check_py3k_warnings`` deals with py3k warnings.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index cab0a14..77e1377 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,9 +35,6 @@
   when turned into an exception: in this case the exception simply
   gets ignored.
 
-- Issue #7372: Fix pstats regression when stripping paths from profile
-  data generated with the profile module.
-
 - Issue #4108: In urllib.robotparser, if there are multiple 'User-agent: *'
   entries, consider the first one.
 
@@ -422,6 +419,10 @@
 Tests
 -----
 
+- Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are
+  effectively raised.  A new private utility ``_check_py3k_warnings`` has been
+  backported to help silencing py3k warnings.
+
 - Issue #8672: Add a zlib test ensuring that an incomplete stream can be
   handled by a decompressor object without errors (it returns incomplete
   uncompressed data).