Reverting the Revision: 77368.  I committed Flox's big patch for tests by
mistake. ( It may come in for sure tough)
diff --git a/Lib/test/mapping_tests.py b/Lib/test/mapping_tests.py
index d17c948..7ec4bb1 100644
--- a/Lib/test/mapping_tests.py
+++ b/Lib/test/mapping_tests.py
@@ -1,7 +1,6 @@
 # tests common to dict and UserDict
 import unittest
 import UserDict
-import test_support
 
 
 class BasicTestMappingProtocol(unittest.TestCase):
@@ -55,18 +54,13 @@
         #len
         self.assertEqual(len(p), 0)
         self.assertEqual(len(d), len(self.reference))
-        #in
+        #has_key
         for k in self.reference:
+            self.assertTrue(d.has_key(k))
             self.assertTrue(k in d)
         for k in self.other:
+            self.assertFalse(d.has_key(k))
             self.assertFalse(k in d)
-        #has_key
-        # Silence Py3k warning
-        with test_support.check_warnings():
-            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)