From ec27d91741d93f3307208bb3faff590446eac0b7 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sat, 5 Jun 2010 13:18:33 +0000 Subject: [PATCH] Fix test_py3kwarn not to test for __cmp__-related DeprecationWarning. --- Lib/test/test_py3kwarn.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index 0f78ac800a..6d3d9625b1 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -251,9 +251,7 @@ class TestPy3KWarnings(unittest.TestCase): # With object as the base class class WarnOnlyCmp(object): def __cmp__(self, other): pass - self.assertEqual(len(w.warnings), 1) - self.assertWarning(None, w, - "Overriding __cmp__ blocks inheritance of __hash__ in 3.x") + self.assertEqual(len(w.warnings), 0) w.reset() class WarnOnlyEq(object): def __eq__(self, other): pass @@ -264,9 +262,7 @@ class TestPy3KWarnings(unittest.TestCase): class WarnCmpAndEq(object): def __cmp__(self, other): pass def __eq__(self, other): pass - self.assertEqual(len(w.warnings), 2) - self.assertWarning(None, w.warnings[0], - "Overriding __cmp__ blocks inheritance of __hash__ in 3.x") + self.assertEqual(len(w.warnings), 1) self.assertWarning(None, w, "Overriding __eq__ blocks inheritance of __hash__ in 3.x") w.reset() @@ -280,9 +276,7 @@ class TestPy3KWarnings(unittest.TestCase): def __hash__(self): pass class WarnOnlyCmp(DefinesAllThree): def __cmp__(self, other): pass - self.assertEqual(len(w.warnings), 1) - self.assertWarning(None, w, - "Overriding __cmp__ blocks inheritance of __hash__ in 3.x") + self.assertEqual(len(w.warnings), 0) w.reset() class WarnOnlyEq(DefinesAllThree): def __eq__(self, other): pass @@ -293,9 +287,7 @@ class TestPy3KWarnings(unittest.TestCase): class WarnCmpAndEq(DefinesAllThree): def __cmp__(self, other): pass def __eq__(self, other): pass - self.assertEqual(len(w.warnings), 2) - self.assertWarning(None, w.warnings[0], - "Overriding __cmp__ blocks inheritance of __hash__ in 3.x") + self.assertEqual(len(w.warnings), 1) self.assertWarning(None, w, "Overriding __eq__ blocks inheritance of __hash__ in 3.x") w.reset() -- 2.50.1