summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2002-04-15 23:52:04 (GMT)
committerTim Peters <tim.peters@gmail.com>2002-04-15 23:52:04 (GMT)
commitf022a4d451d1d91d3462a7508b0bda8ef3d7ff24 (patch)
tree61d760a09dabd3a6616e32b958aeda855b9450c3
parentc15acef4a4ba251f4c4fff38665ebd1c2c81e5f2 (diff)
downloadcpython-f022a4d451d1d91d3462a7508b0bda8ef3d7ff24.zip
cpython-f022a4d451d1d91d3462a7508b0bda8ef3d7ff24.tar.gz
cpython-f022a4d451d1d91d3462a7508b0bda8ef3d7ff24.tar.bz2
Reduce the number of test-suite DeprecationWarnings; start adding
resetwarnings() calls too.
-rw-r--r--Lib/test/test___all__.py2
-rw-r--r--Lib/test/test_coercion.py11
-rw-r--r--Lib/test/test_xmllib.py2
3 files changed, 12 insertions, 3 deletions
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("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 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 @@ def do_prefix_binops():
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 @@ testdoc = """\
import warnings
warnings.filterwarnings("ignore", ".* xmllib .* obsolete.*",
DeprecationWarning)
-del warnings
import test_support
import unittest
@@ -33,6 +32,7 @@ class XMLParserTestCase(unittest.TestCase):
def test_main():
test_support.run_unittest(XMLParserTestCase)
+ warnings.resetwarnings()
if __name__ == "__main__":