There is no TestError, use TestFailed appropriately
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index f52edb6..862fc77 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -785,7 +785,7 @@
c = C()
try: c()
except TypeError: pass
- else: raise TestError, "calling object w/o call method should raise TypeError"
+ else: raise TestFailed, "calling object w/o call method should raise TypeError"
def pymods():
if verbose: print "Testing Python subclass of module..."
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index 33a923d..71222c1 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -1,7 +1,7 @@
import os
from array import array
-from test_support import verify, TESTFN
+from test_support import verify, TESTFN, TestFailed
from UserList import UserList
# verify writelines with instance sequence
@@ -70,23 +70,23 @@
f = open(TESTFN)
if f.name != TESTFN:
- raise TestError, 'file.name should be "%s"' % TESTFN
+ raise TestFailed, 'file.name should be "%s"' % TESTFN
if f.isatty():
- raise TestError, 'file.isatty() should be false'
+ raise TestFailed, 'file.isatty() should be false'
if f.closed:
- raise TestError, 'file.closed should be false'
+ raise TestFailed, 'file.closed should be false'
try:
f.readinto("")
except TypeError:
pass
else:
- raise TestError, 'file.readinto("") should raise a TypeError'
+ raise TestFailed, 'file.readinto("") should raise a TypeError'
f.close()
if not f.closed:
- raise TestError, 'file.closed should be true'
+ raise TestFailed, 'file.closed should be true'
for methodname in ['fileno', 'flush', 'isatty', 'read', 'readinto', 'readline', 'readlines', 'seek', 'tell', 'truncate', 'write', 'xreadlines' ]:
method = getattr(f, methodname)
@@ -95,13 +95,13 @@
except ValueError:
pass
else:
- raise TestError, 'file.%s() on a closed file should raise a ValueError' % methodname
+ raise TestFailed, 'file.%s() on a closed file should raise a ValueError' % methodname
try:
f.writelines([])
except ValueError:
pass
else:
- raise TestError, 'file.writelines([]) on a closed file should raise a ValueError'
+ raise TestFailed, 'file.writelines([]) on a closed file should raise a ValueError'
os.unlink(TESTFN)
diff --git a/Lib/test/test_mpz.py b/Lib/test/test_mpz.py
index 3e0a700..2e57db4 100644
--- a/Lib/test/test_mpz.py
+++ b/Lib/test/test_mpz.py
@@ -1,6 +1,6 @@
import mpz
-from test_support import vereq
+from test_support import vereq, TestFailed
def check_conversion(num):
mpz_num = mpz.mpz(num)