summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-11-06 15:17:52 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-11-06 15:17:52 (GMT)
commit152d61aa5b38b83e4017e38f0d326f8df8541b4b (patch)
treedd4887089ff75482bb31556ab84acd21700c060a /Lib
parenta5ae1f0c25212a48dc839de86d9f29312f6c0a3a (diff)
downloadcpython-152d61aa5b38b83e4017e38f0d326f8df8541b4b.zip
cpython-152d61aa5b38b83e4017e38f0d326f8df8541b4b.tar.gz
cpython-152d61aa5b38b83e4017e38f0d326f8df8541b4b.tar.bz2
Fix tests now that the callable warning is gone.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_bool.py5
-rw-r--r--Lib/test/test_builtin.py1
2 files changed, 2 insertions, 4 deletions
diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index 9d58a2e..16cd1aa 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 ae3a67c..1d35a6a 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)):