diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-06-05 13:18:33 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-06-05 13:18:33 (GMT) |
| commit | ec27d91741d93f3307208bb3faff590446eac0b7 (patch) | |
| tree | 3019955b5761e640210426f2c2144b5494aac66a | |
| parent | 674648e3f2020e30bf73fed7ac77625d6f159de2 (diff) | |
| download | cpython-ec27d91741d93f3307208bb3faff590446eac0b7.zip cpython-ec27d91741d93f3307208bb3faff590446eac0b7.tar.gz cpython-ec27d91741d93f3307208bb3faff590446eac0b7.tar.bz2 | |
Fix test_py3kwarn not to test for __cmp__-related DeprecationWarning.
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index 0f78ac8..6d3d962 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() |