[Python-checkins] r81749 - python/trunk/Lib/test/test_py3kwarn.py

[mark.dickinson]

Author: mark.dickinson
Date: Sat Jun  5 15:18:33 2010
New Revision: 81749

Log:
Fix test_py3kwarn not to test for __cmp__-related DeprecationWarning.


Modified:
   python/trunk/Lib/test/test_py3kwarn.py

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Sat Jun  5 15:18:33 2010
@@ -251,9 +251,7 @@
             # 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 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 @@
                 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 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()