diff options
author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-31 22:01:03 +0000 |
---|---|---|
committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-31 22:01:03 +0000 |
commit | 6257a7bbb2660ae75c44f2e71d7ac2ce73900f74 (patch) | |
tree | 6f010065c95f2d5617f56e07ba2628be21cf9d7a /Lib/test/test_urllibnet.py | |
parent | ad5983364966b49c277b495112ae41c6ae2d01ed (diff) | |
download | cpython-git-6257a7bbb2660ae75c44f2e71d7ac2ce73900f74.tar.gz |
Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests.
Diffstat (limited to 'Lib/test/test_urllibnet.py')
-rw-r--r-- | Lib/test/test_urllibnet.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py index 77b544552d..8eb01e577e 100644 --- a/Lib/test/test_urllibnet.py +++ b/Lib/test/test_urllibnet.py @@ -182,10 +182,8 @@ class urlretrieveNetworkTests(unittest.TestCase): 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) |