From: Tim Peters <tim.peters@gmail.com>
Date: Tue, 16 Apr 2002 00:01:09 +0000 (+0000)
Subject: It makes more sense to call resetwarnings() after every test runs than
X-Git-Tag: v2.3c1~5934
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d79948103ebe6922144ef81919c8b12c434cbb8;p=thirdparty%2FPython%2Fcpython.git

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 18decfeb069d..8e8deae2d4dc 100755
--- 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 2890066f1353..299054f83876 100644
--- 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 6c0ee7b18be6..4be762e0e44f 100644
--- 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 6756b643744f..1284a2c95e92 100644
--- 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()