Changeset 391 for python/trunk/Lib/test/test_call.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_call.py (modified) (2 diffs)

python/trunk/Lib/test/test_call.py

@@ -13 +13 @@
 
     def test_varargs1(self):
-        {}.has_key(0)
+        with test_support.check_py3k_warnings():
+            {}.has_key(0)
 
     def test_varargs2(self):
@@ -25 +26 @@
 
     def test_varargs1_ext(self):
-        {}.has_key(*(0,))
+        with test_support.check_py3k_warnings():
+            {}.has_key(*(0,))
 
     def test_varargs2_ext(self):
         try:
-            {}.has_key(*(1, 2))
+            with test_support.check_py3k_warnings():
+                {}.has_key(*(1, 2))
         except TypeError:
             pass