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.
........
diff --git a/Lib/test/mapping_tests.py b/Lib/test/mapping_tests.py
index c6857ab..6c4e6ec 100644
--- a/Lib/test/mapping_tests.py
+++ b/Lib/test/mapping_tests.py
@@ -1,6 +1,7 @@
# tests common to dict and UserDict
import unittest
import UserDict
+import test_support
class BasicTestMappingProtocol(unittest.TestCase):
@@ -54,13 +55,17 @@
#len
self.assertEqual(len(p), 0)
self.assertEqual(len(d), len(self.reference))
- #has_key
+ #in
for k in self.reference:
- self.assert_(d.has_key(k))
- self.assert_(k in d)
+ self.assertTrue(k in d)
for k in self.other:
- self.failIf(d.has_key(k))
- self.failIf(k in d)
+ self.assertTrue(k not in d)
+ #has_key
+ with test_support._check_py3k_warnings(quiet=True):
+ for k in self.reference:
+ self.assertTrue(d.has_key(k))
+ for k in self.other:
+ self.assertFalse(d.has_key(k))
#cmp
self.assertEqual(cmp(p,p), 0)
self.assertEqual(cmp(d,d), 0)