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_re.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Lib/test/test_re.py') diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index f14ff49488..f166188fb4 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -1,7 +1,7 @@ import sys sys.path = ['.'] + sys.path -from test.test_support import verbose, run_unittest, guard_warnings_filter +from test.test_support import verbose, run_unittest, catch_warning import re from re import Scanner import sys, os, traceback @@ -414,7 +414,7 @@ class ReTests(unittest.TestCase): self.pickle_test(pickle) # old pickles expect the _compile() reconstructor in sre module import warnings - with guard_warnings_filter(): + with catch_warning(): warnings.filterwarnings("ignore", "The sre module is deprecated", DeprecationWarning) from sre import _compile -- cgit v1.2.1