From: Georg Brandl <georg@python.org>
Date: Sun, 7 Feb 2010 11:54:01 +0000 (+0000)
Subject: Manual backport of r78046.
X-Git-Tag: v2.6.5rc1~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8dbee38dd3edd69e6b7584003b70258d548bc06;p=python

Manual backport of r78046.
---

diff --git a/Lib/test/test_richcmp.py b/Lib/test/test_richcmp.py
index ad6838628e..046f216b05 100644
--- 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 1f98cf8642..6101431954 100644
--- 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)