Manual backport of r78046.

diff --git a/Lib/test/test_richcmp.py b/Lib/test/test_richcmp.py
index ad6838628e606de10b3e509293e010934e83c1c4..046f216b05e514e0a103d75d88db1f25830062b9 100644 (file)
--- a/Lib/test/test_richcmp.py
+++ b/Lib/test/test_richcmp.py
@@ -195,9 +195,9 @@ class MiscTest(unittest.TestCase):
             def __lt__(self, other): return 0
             def __gt__(self, other): return 0
             def __eq__(self, other): return 0
-            def __le__(self, other): raise TestFailed, "This shouldn't happen"
-            def __ge__(self, other): raise TestFailed, "This shouldn't happen"
-            def __ne__(self, other): raise TestFailed, "This shouldn't happen"
+            def __le__(self, other): raise test_support.TestFailed, "This shouldn't happen"
+            def __ge__(self, other): raise test_support.TestFailed, "This shouldn't happen"
+            def __ne__(self, other): raise test_support.TestFailed, "This shouldn't happen"
             def __cmp__(self, other): raise RuntimeError, "expected"
         a = Misb()
         b = Misb()

diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index 1f98cf864203136b0ca8b8a78507546e07c16073..610143195449e31b9c4a37efc3c33828e299e867 100644 (file)
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -127,7 +127,7 @@ class test__RandomNameSequence(TC):
                 if i == 20:
                     break
         except:
-            failOnException("iteration")
+            self.failOnException("iteration")
 
 test_classes.append(test__RandomNameSequence)