Manual backport of r78046.
diff --git a/Lib/test/test_richcmp.py b/Lib/test/test_richcmp.py
index ad68386..046f216 100644
--- a/Lib/test/test_richcmp.py
+++ b/Lib/test/test_richcmp.py
@@ -195,9 +195,9 @@
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 1f98cf8..6101431 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -127,7 +127,7 @@
if i == 20:
break
except:
- failOnException("iteration")
+ self.failOnException("iteration")
test_classes.append(test__RandomNameSequence)