From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 6 Nov 2011 15:17:52 +0000 (+0200)
Subject: Fix tests now that the callable warning is gone.
X-Git-Tag: v2.7.3rc1~322
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=152d61aa5b38b83e4017e38f0d326f8df8541b4b;p=thirdparty%2FPython%2Fcpython.git

Fix tests now that the callable warning is gone.
---

diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index 9d58a2e72636..16cd1aa1ff80 100644
--- a/Lib/test/test_bool.py
+++ b/Lib/test/test_bool.py
@@ -180,9 +180,8 @@ class BoolTest(unittest.TestCase):
         self.assertIs(hasattr([], "wobble"), False)
 
     def test_callable(self):
-        with test_support.check_py3k_warnings():
-            self.assertIs(callable(len), True)
-            self.assertIs(callable(1), False)
+        self.assertIs(callable(len), True)
+        self.assertIs(callable(1), False)
 
     def test_isinstance(self):
         self.assertIs(isinstance(True, bool), True)
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index ae3a67c59467..1d35a6afe574 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1683,7 +1683,6 @@ class TestSorted(unittest.TestCase):
 
 def _run_unittest(*args):
     with check_py3k_warnings(
-            (".+ not supported in 3.1", DeprecationWarning),
             (".+ not supported in 3.x", DeprecationWarning),
             (".+ is renamed to imp.reload", DeprecationWarning),
             ("classic int division", DeprecationWarning)):