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_exceptions.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Lib/test/test_exceptions.py') diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index ed1d6dc033..90f6ae7d8b 100644 --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -5,8 +5,7 @@ import sys import unittest import pickle -from test.test_support import (TESTFN, unlink, run_unittest, - guard_warnings_filter) +from test.test_support import TESTFN, unlink, run_unittest # XXX This is not really enough, each *operation* should be tested! -- cgit v1.2.1