diff options
| author | Guido van Rossum <guido@python.org> | 2007-08-16 23:48:43 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-08-16 23:48:43 (GMT) |
| commit | af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9 (patch) | |
| tree | 7719b2787d82dd1cc7afad76ad989fc9b1f1504f /Lib/test/test_import.py | |
| parent | 10c17ba299513184e39c85fc5c3ecaf2fd13187e (diff) | |
| download | cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.zip cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.gz cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.bz2 | |
First merge from the trunk straight into the py3k branch. I'm not
using the message generated by svnmerge, because it contains a lot of
stuff about the Doc tree, which I'm not merging this time due to the
way the Doc tree was initially added. I am however adding roman.py
which was added later to Doc/tools. I'll try to diff the two Doc
trees separately to see if there's stuff I missed.
Diffstat (limited to 'Lib/test/test_import.py')
| -rw-r--r-- | Lib/test/test_import.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index 884d052..3203904 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 @@ -151,7 +151,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) |