It makes more sense to call resetwarnings() after every test runs than

to keep doing that in every test that wants to filter a warning.

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 18decfeb069da5ab7860f92f3ca38fa57d1461b5..8e8deae2d4dc7ca50e33c591434ed040916efebd 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -55,6 +55,7 @@ import getopt
 import traceback
 import random
 import StringIO
+import warnings
 
 import test_support
 
@@ -322,6 +323,7 @@ def runtest(test, generate, verbose, quiet, testdir = None):
                 indirect_test()
         finally:
             sys.stdout = save_stdout
+            warnings.resetwarnings()
     except (ImportError, test_support.TestSkipped), msg:
         if not quiet:
             print "test", test, "skipped --", msg

diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 2890066f135368ab0c6f41a7cc35a6ae7e655cf6..299054f838763945ef6aabaf3bbd14b9ca660041 100644 (file)
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -158,5 +158,3 @@ check_all("weakref")
 check_all("webbrowser")
 check_all("xdrlib")
 check_all("zipfile")
-
-warnings.resetwarnings()

diff --git a/Lib/test/test_coercion.py b/Lib/test/test_coercion.py
index 6c0ee7b18be6dd93364d41f8147de771b54086f9..4be762e0e44f1ee0ee5ee593612adf1bf4a852cb 100644 (file)
--- a/Lib/test/test_coercion.py
+++ b/Lib/test/test_coercion.py
@@ -113,8 +113,5 @@ def do_prefix_binops():
 warnings.filterwarnings("ignore",
                         r'complex divmod\(\), // and % are deprecated',
                         DeprecationWarning)
-try:
-    do_infix_binops()
-    do_prefix_binops()
-finally:
-    warnings.resetwarnings()
+do_infix_binops()
+do_prefix_binops()

diff --git a/Lib/test/test_xmllib.py b/Lib/test/test_xmllib.py
index 6756b643744fcfee459e406330b15d40846da182..1284a2c95e926f064a8c1a52b91964495e07ca4b 100644 (file)
--- a/Lib/test/test_xmllib.py
+++ b/Lib/test/test_xmllib.py
@@ -32,8 +32,6 @@ class XMLParserTestCase(unittest.TestCase):
 
 def test_main():
     test_support.run_unittest(XMLParserTestCase)
-    warnings.resetwarnings()
-
 
 if __name__ == "__main__":
     test_main()