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_warnings.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_warnings.py')
| -rw-r--r-- | Lib/test/test_warnings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py index 5768a68..54d5dd2 100644 --- a/Lib/test/test_warnings.py +++ b/Lib/test/test_warnings.py @@ -61,7 +61,7 @@ class TestModule(unittest.TestCase): def test_options(self): # Uses the private _setoption() function to test the parsing # of command-line warning arguments - with test_support.guard_warnings_filter(): + with test_support.catch_warning(): self.assertRaises(warnings._OptionError, warnings._setoption, '1:2:3:4:5:6') self.assertRaises(warnings._OptionError, |