From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 2 Aug 2010 21:00:32 +0000 (+0000)
Subject: Fix test_operator.
X-Git-Tag: v2.6.6rc1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9a4e29db92f279e47866fbe61a5e7840fe876c1;p=thirdparty%2FPython%2Fcpython.git

Fix test_operator.
---

diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py
index c081f220f973..4e9b3c481f28 100644
--- a/Lib/test/test_operator.py
+++ b/Lib/test/test_operator.py
@@ -192,8 +192,8 @@ class OperatorTestCase(unittest.TestCase):
         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 @@ class OperatorTestCase(unittest.TestCase):
         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)