commit 6257a7bbb2660ae75c44f2e71d7ac2ce73900f74
author Florent Xicluna <florent.xicluna@gmail.com> Wed Mar 31 22:01:03 2010 +0000
committer Florent Xicluna <florent.xicluna@gmail.com> Wed Mar 31 22:01:03 2010 +0000
tree 6f010065c95f2d5617f56e07ba2628be21cf9d7a
parent ad5983364966b49c277b495112ae41c6ae2d01ed

Replace catch_warnings with check_warnings when it makes sense.  Use assertRaises context manager to simplify some tests.

Lib/test/test_urllibnet.py

diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 77b5445..8eb01e5 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -182,10 +182,8 @@
 
 def test_main():
     test_support.requires('network')
-    from warnings import filterwarnings, catch_warnings
-    with catch_warnings():
-        filterwarnings('ignore', '.*urllib\.urlopen.*Python 3.0',
-                        DeprecationWarning)
+    with test_support.check_py3k_warnings(
+            ("urllib.urlopen.. has been removed", DeprecationWarning)):
         test_support.run_unittest(URLTimeoutTest,
                                   urlopenNetworkTests,
                                   urlretrieveNetworkTests)