commit 3efafd77498def137f4afbcf2abee9aa2aed460a
author Ezio Melotti <ezio.melotti@gmail.com> Mon Aug 02 18:40:55 2010 +0000
committer Ezio Melotti <ezio.melotti@gmail.com> Mon Aug 02 18:40:55 2010 +0000
tree e491bca6f159d278f142478ad73b287cd20b958d
parent 5ff2745fed91dca3dca20360945562df70ed7767

Merged revisions 77942,79023 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77942 | ezio.melotti | 2010-02-03 07:37:26 +0200 (Wed, 03 Feb 2010) | 1 line

  #7092: Silence more py3k warnings. Patch by Florent Xicluna.
........
  r79023 | ezio.melotti | 2010-03-17 15:52:48 +0200 (Wed, 17 Mar 2010) | 1 line

  #7092: silence some more py3k warnings.
........

Lib/test/test_dict.py

diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py
index 0907744..3ae0435 100644
--- a/Lib/test/test_dict.py
+++ b/Lib/test/test_dict.py
@@ -582,11 +582,14 @@
     type2test = Dict
 
 def test_main():
-    test_support.run_unittest(
-        DictTest,
-        GeneralMappingTests,
-        SubclassMappingTests,
-    )
+    with test_support._check_py3k_warnings(
+        ('dict(.has_key..| inequality comparisons) not supported in 3.x',
+         DeprecationWarning)):
+        test_support.run_unittest(
+            DictTest,
+            GeneralMappingTests,
+            SubclassMappingTests,
+        )
 
 if __name__ == "__main__":
     test_main()