summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2006-04-27 23:41:27 (GMT)
committerThomas Wouters <thomas@python.org>2006-04-27 23:41:27 (GMT)
commit076ba2129bb08f56c3af9397748ae1df41daba06 (patch)
treee363893a3e28b07143424b38d312ebe7a4a411cf
parent9df4e6f6735af274813cf1b611ee1a342955ad63 (diff)
downloadcpython-076ba2129bb08f56c3af9397748ae1df41daba06.zip
cpython-076ba2129bb08f56c3af9397748ae1df41daba06.tar.gz
cpython-076ba2129bb08f56c3af9397748ae1df41daba06.tar.bz2
Add more ignores of ImportWarnings; these are all just potential triggers
(since they won't trigger if zlib is already sucessfully imported); they were found by grepping .py files, instead of looking at warning output :)
-rwxr-xr-xLib/test/regrtest.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index be06d9d..ce9ed22 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -140,7 +140,9 @@ if sys.maxint > 0x7fffffff:
# Ignore ImportWarnings that only occur in the source tree,
# (because of modules with the same name as source-directories in Modules/)
-for mod in ("ctypes", "gzip", "test.test_zipimport", "test.test_zlib"):
+for mod in ("ctypes", "gzip", "zipfile", "tarfile", "encodings.zlib_codec",
+ "test.test_zipimport", "test.test_zlib", "test.test_zipfile",
+ "test.test_codecs", "test.string_tests"):
warnings.filterwarnings(module=".*%s$" % (mod,),
action="ignore", category=ImportWarning)