[Python-checkins] cpython (2.7): Fix tests now that the callable warning is gone.

Sun Nov 6 16:18:38 CET 2011

http://hg.python.org/cpython/rev/0ff37060913d
changeset: 73404:0ff37060913d
branch: 2.7
parent: 73402:39573be48b4a
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sun Nov 06 17:17:52 2011 +0200
summary:
 Fix tests now that the callable warning is gone.
files:
 Lib/test/test_bool.py | 5 ++---
 Lib/test/test_builtin.py | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
--- a/Lib/test/test_bool.py
+++ b/Lib/test/test_bool.py
@@ -180,9 +180,8 @@
 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
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1683,7 +1683,6 @@
 
 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)):
-- 
Repository URL: http://hg.python.org/cpython
