summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_import.py
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2007-08-14 05:51:06 (GMT)
committerBrett Cannon <bcannon@gmail.com>2007-08-14 05:51:06 (GMT)
commit2ee4128e9b4f481d5029fe4c8ada6c12ac64e2bd (patch)
treedcdfe00aac7f3bdbe594720cc8dac33541863c04 /Lib/test/test_import.py
parentbe7abbb9d9d886d83c6990f7c68e8e4f84b57c8d (diff)
downloadcpython-2ee4128e9b4f481d5029fe4c8ada6c12ac64e2bd.zip
cpython-2ee4128e9b4f481d5029fe4c8ada6c12ac64e2bd.tar.gz
cpython-2ee4128e9b4f481d5029fe4c8ada6c12ac64e2bd.tar.bz2
Remove test.test_support.guard_warnings_filter.
test.test_support.catch_warning is more full-featured and provides the same functionality. Since guard_warnings_filter was added in 2.6 there is no backwards-compatibility issues.
Diffstat (limited to 'Lib/test/test_import.py')
-rw-r--r--Lib/test/test_import.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index a061a40..a805534 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -1,4 +1,4 @@
-from test.test_support import TESTFN, run_unittest, guard_warnings_filter
+from test.test_support import TESTFN, run_unittest, catch_warning
import unittest
import os
@@ -215,7 +215,7 @@ class ImportTest(unittest.TestCase):
self.assert_(y is test.test_support, y.__name__)
def test_import_initless_directory_warning(self):
- with guard_warnings_filter():
+ with catch_warning():
# Just a random non-package directory we always expect to be
# somewhere in sys.path...
warnings.simplefilter('error', ImportWarning)