commit 07627880813ffaad8d9b90bfe8791ccf588b031b
author Florent Xicluna <florent.xicluna@gmail.com> Sun Mar 21 01:14:24 2010 +0000
committer Florent Xicluna <florent.xicluna@gmail.com> Sun Mar 21 01:14:24 2010 +0000
tree 14fbe48b451085257da7c79781999cc86729c74f
parent 8cb253f8d6333af0a575d5951379c090752c0fc6

#7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.

Lib/test/test_bool.py

diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index e342d7b..7464c71 100644
--- a/Lib/test/test_bool.py
+++ b/Lib/test/test_bool.py
@@ -85,10 +85,10 @@
         self.assertEqual(False*1, 0)
         self.assertIsNot(False*1, False)
 
-        self.assertEqual(True/1, 1)
-        self.assertIsNot(True/1, True)
-        self.assertEqual(False/1, 0)
-        self.assertIsNot(False/1, False)
+        self.assertEqual(True//1, 1)
+        self.assertIsNot(True//1, True)
+        self.assertEqual(False//1, 0)
+        self.assertIsNot(False//1, False)
 
         for b in False, True:
             for i in 0, 1, 2:
@@ -162,8 +162,9 @@
         self.assertIs(hasattr([], "wobble"), False)
 
     def test_callable(self):
-        self.assertIs(callable(len), True)
-        self.assertIs(callable(1), False)
+        with test_support.check_py3k_warnings():
+            self.assertIs(callable(len), True)
+            self.assertIs(callable(1), False)
 
     def test_isinstance(self):
         self.assertIs(isinstance(True, bool), True)
@@ -178,8 +179,11 @@
         self.assertIs(issubclass(int, bool), False)
 
     def test_haskey(self):
-        self.assertIs({}.has_key(1), False)
-        self.assertIs({1:1}.has_key(1), True)
+        self.assertIs(1 in {}, False)
+        self.assertIs(1 in {1:1}, True)
+        with test_support.check_py3k_warnings():
+            self.assertIs({}.has_key(1), False)
+            self.assertIs({1:1}.has_key(1), True)
 
     def test_string(self):
         self.assertIs("xyz".endswith("z"), True)
@@ -251,8 +255,9 @@
         import operator
         self.assertIs(operator.truth(0), False)
         self.assertIs(operator.truth(1), True)
-        self.assertIs(operator.isCallable(0), False)
-        self.assertIs(operator.isCallable(len), True)
+        with test_support.check_py3k_warnings():
+            self.assertIs(operator.isCallable(0), False)
+            self.assertIs(operator.isCallable(len), True)
         self.assertIs(operator.isNumberType(None), False)
         self.assertIs(operator.isNumberType(0), True)
         self.assertIs(operator.not_(1), False)