diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 19:56:05 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 19:56:05 (GMT) |
| commit | a65e2afe804743332b37234d66c7fe0789da760d (patch) | |
| tree | 40668ea69e19b7780617ffb21a986bc3a2aebdfe /Lib/test/test_bool.py | |
| parent | edabc7bca29766539bfbaa2e25aac8fdc79bdb60 (diff) | |
| download | cpython-a65e2afe804743332b37234d66c7fe0789da760d.zip cpython-a65e2afe804743332b37234d66c7fe0789da760d.tar.gz cpython-a65e2afe804743332b37234d66c7fe0789da760d.tar.bz2 | |
Merged revisions 79165 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79165 | florent.xicluna | 2010-03-21 03:14:24 +0200 (Sun, 21 Mar 2010) | 2 lines
#7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.
........
Diffstat (limited to 'Lib/test/test_bool.py')
| -rw-r--r-- | Lib/test/test_bool.py | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py index 33185a0..150dc31 100644 --- a/Lib/test/test_bool.py +++ b/Lib/test/test_bool.py @@ -91,10 +91,10 @@ class BoolTest(unittest.TestCase): 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: @@ -168,8 +168,9 @@ class BoolTest(unittest.TestCase): 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) @@ -184,8 +185,11 @@ class BoolTest(unittest.TestCase): 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) @@ -257,8 +261,9 @@ class BoolTest(unittest.TestCase): 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) |