Fix tests now that the callable warning is gone.

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)

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)):