From af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 16 Aug 2007 23:48:43 +0000 Subject: 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. --- Lib/test/test_macostools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/test/test_macostools.py') diff --git a/Lib/test/test_macostools.py b/Lib/test/test_macostools.py index 40b690a1f6..eea3601cf3 100644 --- a/Lib/test/test_macostools.py +++ b/Lib/test/test_macostools.py @@ -52,7 +52,7 @@ class TestMacostools(unittest.TestCase): def test_touched(self): # This really only tests that nothing unforeseen happens. import warnings - with test_support.guard_warnings_filter(): + with test_support.catch_warning(): warnings.filterwarnings('ignore', 'macostools.touched*', DeprecationWarning) macostools.touched(test_support.TESTFN) -- cgit v1.2.1