[Python-checkins] r83579 - python/branches/release26-maint/Lib/test/test_operator.py

[ezio.melotti]

Author: ezio.melotti
Date: Mon Aug  2 23:00:32 2010
New Revision: 83579

Log:
Fix test_operator.

Modified:
   python/branches/release26-maint/Lib/test/test_operator.py

Modified: python/branches/release26-maint/Lib/test/test_operator.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_operator.py	(original)
+++ python/branches/release26-maint/Lib/test/test_operator.py	Mon Aug  2 23:00:32 2010
@@ -192,8 +192,8 @@
         class C:
             pass
         def check(self, o, v):
+            self.assertEqual(operator.isCallable(o), v)
             with test_support._check_py3k_warnings():
-                self.assertEqual(operator.isCallable(o), v)
                 self.assertEqual(callable(o), v)
         check(self, 4, 0)
         check(self, operator.isCallable, 1)
@@ -308,9 +308,8 @@
         self.assertRaises(TypeError, operator.contains, None, None)
         self.assertTrue(operator.contains(range(4), 2))
         self.assertFalse(operator.contains(range(4), 5))
-        with test_support._check_py3k_warnings():
-            self.assertTrue(operator.sequenceIncludes(range(4), 2))
-            self.assertFalse(operator.sequenceIncludes(range(4), 5))
+        self.assertTrue(operator.sequenceIncludes(range(4), 2))
+        self.assertFalse(operator.sequenceIncludes(range(4), 5))
 
     def test_setitem(self):
         a = range(3)