Silence some py3k SyntaxWarning using check_py3k_warnings() with "exec" statements.
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 1a2009c..8a95f6d 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -2,6 +2,7 @@
import sys
import _ast
from test import test_support
+import textwrap
class TestSpecifics(unittest.TestCase):
@@ -142,6 +143,9 @@
def test_complex_args(self):
+ with test_support.check_py3k_warnings(
+ ("tuple parameter unpacking has been removed", SyntaxWarning)):
+ exec textwrap.dedent('''
def comp_args((a, b)):
return a,b
self.assertEqual(comp_args((1, 2)), (1, 2))
@@ -159,6 +163,7 @@
return a, b, c
self.assertEqual(comp_args(1, (2, 3)), (1, 2, 3))
self.assertEqual(comp_args(), (2, 3, 4))
+ ''')
def test_argument_order(self):
try:
diff --git a/Lib/test/test_complex_args.py b/Lib/test/test_complex_args.py
index c6d50a9..036cbea 100644
--- a/Lib/test/test_complex_args.py
+++ b/Lib/test/test_complex_args.py
@@ -1,23 +1,30 @@
import unittest
from test import test_support
+import textwrap
class ComplexArgsTestCase(unittest.TestCase):
def check(self, func, expected, *args):
self.assertEqual(func(*args), expected)
- # These functions are tested below as lambdas too. If you add a function test,
- # also add a similar lambda test.
+ # These functions are tested below as lambdas too. If you add a
+ # function test, also add a similar lambda test.
+
+ # Functions are wrapped in "exec" statements in order to
+ # silence Py3k warnings.
def test_func_parens_no_unpacking(self):
+ exec textwrap.dedent("""
def f(((((x))))): return x
self.check(f, 1, 1)
# Inner parens are elided, same as: f(x,)
def f(((x)),): return x
self.check(f, 2, 2)
+ """)
def test_func_1(self):
+ exec textwrap.dedent("""
def f(((((x),)))): return x
self.check(f, 3, (3,))
def f(((((x)),))): return x
@@ -26,16 +33,22 @@
self.check(f, 5, (5,))
def f(((x),)): return x
self.check(f, 6, (6,))
+ """)
def test_func_2(self):
+ exec textwrap.dedent("""
def f(((((x)),),)): return x
self.check(f, 2, ((2,),))
+ """)
def test_func_3(self):
+ exec textwrap.dedent("""
def f((((((x)),),),)): return x
self.check(f, 3, (((3,),),))
+ """)
def test_func_complex(self):
+ exec textwrap.dedent("""
def f((((((x)),),),), a, b, c): return x, a, b, c
self.check(f, (3, 9, 8, 7), (((3,),),), 9, 8, 7)
@@ -44,18 +57,22 @@
def f(a, b, c, ((((((x)),)),),)): return a, b, c, x
self.check(f, (9, 8, 7, 3), 9, 8, 7, (((3,),),))
+ """)
# Duplicate the tests above, but for lambda. If you add a lambda test,
# also add a similar function test above.
def test_lambda_parens_no_unpacking(self):
+ exec textwrap.dedent("""
f = lambda (((((x))))): x
self.check(f, 1, 1)
# Inner parens are elided, same as: f(x,)
f = lambda ((x)),: x
self.check(f, 2, 2)
+ """)
def test_lambda_1(self):
+ exec textwrap.dedent("""
f = lambda (((((x),)))): x
self.check(f, 3, (3,))
f = lambda (((((x)),))): x
@@ -64,16 +81,22 @@
self.check(f, 5, (5,))
f = lambda (((x),)): x
self.check(f, 6, (6,))
+ """)
def test_lambda_2(self):
+ exec textwrap.dedent("""
f = lambda (((((x)),),)): x
self.check(f, 2, ((2,),))
+ """)
def test_lambda_3(self):
+ exec textwrap.dedent("""
f = lambda ((((((x)),),),)): x
self.check(f, 3, (((3,),),))
+ """)
def test_lambda_complex(self):
+ exec textwrap.dedent("""
f = lambda (((((x)),),),), a, b, c: (x, a, b, c)
self.check(f, (3, 9, 8, 7), (((3,),),), 9, 8, 7)
@@ -82,10 +105,14 @@
f = lambda a, b, c, ((((((x)),)),),): (a, b, c, x)
self.check(f, (9, 8, 7, 3), 9, 8, 7, (((3,),),))
+ """)
def test_main():
- test_support.run_unittest(ComplexArgsTestCase)
+ with test_support.check_py3k_warnings(
+ ("tuple parameter unpacking has been removed", SyntaxWarning),
+ ("parenthesized argument names are invalid", SyntaxWarning)):
+ test_support.run_unittest(ComplexArgsTestCase)
if __name__ == "__main__":
test_main()