summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_exceptions.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-16 23:48:43 (GMT)
committerGuido van Rossum <guido@python.org>2007-08-16 23:48:43 (GMT)
commitaf554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9 (patch)
tree7719b2787d82dd1cc7afad76ad989fc9b1f1504f /Lib/test/test_exceptions.py
parent10c17ba299513184e39c85fc5c3ecaf2fd13187e (diff)
downloadcpython-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_exceptions.py')
-rw-r--r--Lib/test/test_exceptions.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index ed1d6dc..90f6ae7 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!