Reduce the number of test-suite DeprecationWarnings; start adding
resetwarnings() calls too.
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 299054f..2890066 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -158,3 +158,5 @@
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 d39e6fd..6c0ee7b 100644
--- a/Lib/test/test_coercion.py
+++ b/Lib/test/test_coercion.py
@@ -1,5 +1,6 @@
import copy
import sys
+import warnings
# Fake a number that implements numeric methods through __coerce__
class CoerceNumber:
@@ -109,5 +110,11 @@
else:
print '=', x
-do_infix_binops()
-do_prefix_binops()
+warnings.filterwarnings("ignore",
+ r'complex divmod\(\), // and % are deprecated',
+ DeprecationWarning)
+try:
+ do_infix_binops()
+ do_prefix_binops()
+finally:
+ warnings.resetwarnings()
diff --git a/Lib/test/test_xmllib.py b/Lib/test/test_xmllib.py
index 97ae141..6756b64 100644
--- a/Lib/test/test_xmllib.py
+++ b/Lib/test/test_xmllib.py
@@ -16,7 +16,6 @@
import warnings
warnings.filterwarnings("ignore", ".* xmllib .* obsolete.*",
DeprecationWarning)
-del warnings
import test_support
import unittest
@@ -33,6 +32,7 @@
def test_main():
test_support.run_unittest(XMLParserTestCase)
+ warnings.resetwarnings()
if __name__ == "__main__":